[linux] 04/05: Update to 3.16.35
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun May 8 01:46:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch jessie
in repository linux.
commit 1577b111e194b11ae43ae3aa40e30904071fa188
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sat May 7 21:28:38 2016 +0100
Update to 3.16.35
Drop one patch applied upstream.
Fix/revert some ABI changes.
---
debian/changelog | 171 ++++++++++++++++++++-
.../misc-bmp085-Enable-building-as-a-module.patch | 29 ----
...-add-link-layer-header-validation-functio.patch | 40 +++++
...t-net-validate-variable-length-ll-headers.patch | 55 +++++++
.../debian/bpf-fix-abi-change-in-3.16.35.patch | 28 ++++
.../debian/fs-fix-abi-change-in-3.16.35.patch | 60 ++++++++
...3.patch => pci-fix-abi-changes-in-3.16.y.patch} | 13 +-
debian/patches/series | 7 +-
8 files changed, 364 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8ca525d..8d46eec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-linux (3.16.7-ckt27-1) UNRELEASED; urgency=medium
+linux (3.16.35-1) UNRELEASED; urgency=medium
* New upstream stable update:
http://kernel.ubuntu.com/stable/ChangeLog-3.16.7-ckt26
@@ -143,14 +143,179 @@ linux (3.16.7-ckt27-1) UNRELEASED; urgency=medium
- staging: comedi: ni_tiocmd: change mistaken use of start_src for start_arg
- drm/radeon: hold reference to fences in radeon_sa_bo_new (3.17 and older)
- [x86] Drivers: hv: vmbus: prevent cpu offlining on newer hypervisors
+ https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.16.35
+ - [x86] EDAC, amd64_edac: Shift wrapping issue in f1x_get_norm_dct_addr()
+ - [x86] crypto: ccp - Add hash state import and export support
+ - [armhf] PCI: imx6: Remove broken Gen2 workaround
+ - [armhf] PCI: imx6: Move link up check into imx6_pcie_wait_for_link()
+ - tty: Fix GPF in flush_to_ldisc(), part 2
+ - media: v4l2-compat-ioctl32: fix missing length copy in put_v4l2_buffer32
+ - [x86] crypto: ccp - Limit the amount of information exported
+ - xc2028: avoid use after free
+ - xc2028: unlock on error in xc2028_set_config()
+ - nbd: ratelimit error msgs after socket close
+ - [x86] crypto: ccp - Don't assume export/import areas are aligned
+ - 8250: use callbacks to access UART_DLL/UART_DLM
+ - net: irda: Fix use-after-free in irtty_open()
+ - [armhf] dts: armada-375: use armada-370-sata for SATA
+ - mtd: map: fix .set_vpp() documentation
+ - usb: retry reset if a device times out
+ - HID: logitech: fix Dual Action gamepad support
+ - HID: core: do not scan reports if the group is already set
+ - HID: fix hid_ignore_special_drivers module parameter
+ - [armhf] regulator: s5m8767: fix get_register() error handling
+ - saa7134: Fix bytesperline not being set correctly for planar formats
+ - [armhf] OMAP3: Add cpuidle parameters table for omap3430
+ - [x86] mei: fix possible integer overflow issue
+ - [x86] mei: fix format string in debug prints
+ - aacraid: Fix memory leak in aac_fib_map_free
+ - mac80211: fix unnecessary frame drops in mesh fwding
+ - mac80211: avoid excessive stack usage in sta_info
+ - mac80211: fix memory leak
+ - mtd: onenand: fix deadlock in onenand_block_markbad
+ - [armel/versatile] clk: sp810: support reentrance
+ - md/raid5: Compare apples to apples (or sectors to sectors)
+ - [x86] crypto: ccp - memset request context to zero during import
+ - mmc: sdhci: fix data timeout
+ - IB/srpt: Simplify srpt_handle_tsk_mgmt()
+ - bttv: Width must be a multiple of 16 when capturing planar formats
+ - nfsd4: fix bad bounds checking
+ - net/mlx5: Make command timeout way shorter
+ - xfs: fix two memory leaks in xfs_attr_list.c error paths
+ - drivers/misc/ad525x_dpot: AD5274 fix RDAC read back errors
+ - mtip32xx: Fix broken service thread handling
+ - mtip32xx: Remove unwanted code from taskfile error handler
+ - mtip32xx: Avoid issuing standby immediate cmd during FTL rebuild
+ - [amd64] clk: xgene: Add missing parenthesis when clearing divider value
+ - of: alloc anywhere from memblock if range not specified
+ - usb: hub: fix a typo in hub_port_init() leading to wrong logic
+ - [x86] KVM: i8254: change PIT discard tick policy
+ - sched/cputime: Fix steal time accounting vs. CPU hotplug
+ - ipvs: correct initial offset of Call-ID header search in SIP
+ persistence engine
+ - mwifiex: fix corner case association failure
+ - perf/core: Fix perf_sched_count derailment
+ - [x86] perf/intel: Use PAGE_SIZE for PEBS buffer size on Core2
+ - [x86] perf/intel: Fix PEBS warning by only restoring active PMU in pmi
+ - [x86] perf/intel: Add definition for PT PMI bit
+ - [x86] perf/pebs: Add workaround for broken OVFL status on HSW+
+ - [x86] perf/intel: Fix PEBS data source interpretation on Nehalem/Westmere
+ - sched/cputime: Fix steal_account_process_tick() to always return jiffies
+ - bcache: Fix more early shutdown bugs
+ - bcache: cleaned up error handling around register_cache()
+ - bcache: fix cache_set_flush() NULL pointer dereference on OOM
+ - [x86] PCI: Mark Broadwell-EP Home Agent & PCU as having non-compliant BARs
+ - be2iscsi: set the boot_kset pointer to NULL in case of failure
+ - [x86] drm/radeon: add a PX quirk list
+ - [x86] drm/radeon: add PX quirk for asus K53TK
+ - drm/radeon: Don't drop DP 2.7 Ghz link setup on some cards.
+ - sg: fix dxferp in from_to case
+ - jbd2: fix FS corruption possibility in jbd2_journal_destroy() on
+ umount path
+ - sctp: fix the transports round robin issue when init is retransmitted
+ - [x86] ALSA: intel8x0: Add clock quirk entry for AD1981B on IBM
+ ThinkPad X41.
+ - fuse: do not use iocb after it may have been freed
+ - [s390x] pci: extract software counters from fmb
+ - [s390x] pci: enforce fmb page boundary rule
+ - net: Fix use after free in the recvmmsg exit path
+ - mlx4: add missing braces in verify_qp_parameters
+ - ath9k: fix buffer overrun for ar9287
+ - md: multipath: don't hardcopy bio in .make_request path
+ - HID: i2c-hid: fix OOB write in i2c_hid_set_or_send_report()
+ - ALSA: hda - Fix unconditional GPIO toggle via automute
+ - gpiolib: Fix comment referring to gpio_*() in gpiod_*()
+ - nfsd: fix deadlock secinfo+readdir compound
+ - vfs: show_vfsstat: do not ignore errors from show_devname method
+ - ppp: ensure file->private_data can't be overridden
+ - [x86] iopl: Fix iopl capability check on Xen PV
+ - sunrpc/cache: drop reference when sunrpc_cache_pipe_upcall() detects
+ a race
+ - Input: ims-pcu - sanity check against missing interfaces
+ - Input: synaptics - handle spurious release of trackstick buttons, again
+ - [x86] apic: Fix suspicious RCU usage in
+ smp_trace_call_function_interrupt()
+ - USB: usb_driver_claim_interface: add sanity checking
+ - tracing: Have preempt(irqs)off trace preempt disabled functions
+ - lpfc: fix misleading indentation
+ - tracing: Fix crash from reading trace_pipe with sendfile
+ - splice: handle zero nr_pages in splice_to_pipe()
+ - ethernet: micrel: fix some error codes
+ - tunnels: Don't apply GRO to multiple layers of encapsulation.
+ - [armhf] mdio-sun4i: oops in error handling in probe
+ - target: Fix target_release_cmd_kref shutdown comp leak
+ - [x86] KVM: VMX: avoid guest hang on invalid invept instruction
+ - [x86] KVM: fix spin_lock_init order on x86
+ - tracing: Fix trace_printk() to print when not using bprintk()
+ - fs/coredump: prevent fsuid=0 dumps into user-controlled directories
+ - [x86] ALSA: hda - Asus N750JV external subwoofer fixup
+ - [x86] ALSA: hda - Fix white noise on Asus N750JV headphone
+ - [x86] ALSA: hda - Apply fix for white noise on Asus N550JV, too
+ - [x86] ideapad-laptop: Add ideapad Y700 (15) to the no_hw_rfkill DMI list
+ - ppp: take reference on channels netns
+ - drm/radeon: add a dpm quirk for sapphire Dual-X R7 370 2G D5
+ - ocfs2/dlm: fix race between convert and recovery
+ - ocfs2/dlm: fix BUG in dlm_move_lockres_to_recovery_list
+ - hwmon: (max1111) Return -ENODEV from max1111_read_channel if not
+ instantiated
+ - drm/radeon: add another R7 370 quirk
+ - drm/radeon: add a dpm quirk for all R7 370 parts
+ - ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
+ - ALSA: usb-audio: Fix double-free in error paths after
+ snd_usb_add_audio_stream() call
+ - USB: mct_u232: add sanity checking in probe (CVE-2016-3136)
+ - USB: cypress_m8: add endpoint sanity check (CVE-2016-3137)
+ - USB: digi_acceleport: do sanity checking for the number of ports
+ (CVE-2016-3140)
+ - sd: Fix excessive capacity printing on devices with blocks bigger than
+ 512 bytes
+ - drm/dp: move hw_mutex up the call stack
+ - drm/udl: Use unlocked gem unreferencing
+ - ext4: add lockdep annotations for i_data_sem
+ - [x86] ALSA: hda - fix front mic problem for a HP desktop
+ - [x86] KVM: Inject pending interrupt even if pending nmi exist
+ - ALSA: timer: Use mod_timer() for rearming the system timer
+ - mm: fix invalid node in alloc_migrate_target()
+ - xen/events: Mask a moving irq
+ - compiler-gcc: disable -ftracer for __noclone functions
+ - ip6_tunnel: set rtnl_link_ops before calling register_netdevice
+ - Btrfs: fix file/data loss caused by fsync after rename and new inode
+ - [armhf] gpio: pca953x: Use correct u16 value for register word write
+ - CVE-2016-3134
+ - netfilter: x_tables: Fix parsing of IPT_SO_SET_REPLACE blobs
+ (CVE-2016-3134)
+ + validate e->target_offset early
+ + make sure e->next_offset covers remaining blob size
+ - [x86] mm/32: Enable full randomization on i386 and X86_32 (CVE-2016-3672)
+ - usbnet: cleanup after bind() in probe() (CVE-2016-3951)
+ - USB: usbip: fix potential out-of-bounds write (CVE-2016-3955)
+ - [s390x] mm: four page table levels vs. fork (CVE-2016-2143)
+ - ext4: fix NULL pointer dereference in ext4_mark_inode_dirty()
+ - net: jme: fix suspend/resume on JMC260
+ - sctp: lack the check for ports in sctp_v6_cmp_addr
+ - cdc_ncm: toggle altsetting to force reset before setup
+ - udp6: fix UDP/IPv6 encap resubmit path
+ - macvtap: always pass ethernet header in linear
+ - farsync: fix off-by-one bug in fst_add_one
+ - qlge: Fix receive packets drop.
+ - xfrm: Fix crash observed during device unregistration and decryption
+ - tun, bpf: fix suspicious RCU usage in tun_{attach, detach}_filter
+ - ipv4: l2tp: fix a potential issue in l2tp_ip_recv
+ - ipv6: l2tp: fix a potential issue in l2tp_ip6_recv
+ - ipv6: Count in extension headers in skb->network_header
+ - jme: Do not enable NIC WoL functions on S0
+ - jme: Fix device PM wakeup API usage
+ - netfilter: x_tables: fix unconditional helper
+ - crypto: gcm - Fix rfc4543 decryption crash
[ Ben Hutchings ]
* [amd64] KVM: bit-ops emulation ignores offset on 64-bit (Closes: #818502)
* linux-headers: Avoid mixed implicit and normal rules in Makefile, thanks to
Thierry Herbelot (Closes: #822666)
* Revert "libata: Align ata_device's id on a cacheline" to avoid ABI change
- * Revert "net/ipv6: add sysctl option accept_ra_min_hop_limit" to avoid ABI
- change
+ * Revert "net: validate variable length ll headers", "ax25: add link layer
+ header validation function" and "net/ipv6: add sysctl option
+ accept_ra_min_hop_limit" to avoid ABI changes
* stable-update: Rewrite stable-update.sh in Python
-- Ben Hutchings <ben at decadent.org.uk> Sat, 30 Apr 2016 22:07:22 +0200
diff --git a/debian/patches/bugfix/all/misc-bmp085-Enable-building-as-a-module.patch b/debian/patches/bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
deleted file mode 100644
index c3c5a62..0000000
--- a/debian/patches/bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Date: Mon, 24 Jun 2013 05:28:00 +0100
-Subject: misc/bmp085: Enable building as a module
-Forwarded: http://thread.gmane.org/gmane.linux.kernel/1514281
-
-Commit 985087dbcb02 'misc: add support for bmp18x chips to the bmp085
-driver' changed the BMP085 config symbol to a boolean. I see no
-reason why the shared code cannot be built as a module, so change it
-back to tristate.
-
-Cc: Eric Andersson <eric.andersson at unixphere.com>
-Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
----
- drivers/misc/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index c002d86..7a68184 100644
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -451,7 +451,7 @@ config ARM_CHARLCD
- still useful.
-
- config BMP085
-- bool
-+ tristate
- depends on SYSFS
-
- config BMP085_I2C
diff --git a/debian/patches/bugfix/all/revert-ax25-add-link-layer-header-validation-functio.patch b/debian/patches/bugfix/all/revert-ax25-add-link-layer-header-validation-functio.patch
new file mode 100644
index 0000000..672d497
--- /dev/null
+++ b/debian/patches/bugfix/all/revert-ax25-add-link-layer-header-validation-functio.patch
@@ -0,0 +1,40 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 1 May 2016 17:59:44 +0200
+Subject: Revert "ax25: add link layer header validation function"
+
+This reverts commit 0954b59d9f4b2dcc59f28d1f64c3a21062a64372, which was
+commit ea47781c26510e5d97f80f9aceafe9065bd5e3aa upstream. It is
+pointless unless af_packet calls the new function.
+---
+ net/ax25/ax25_ip.c | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c
+index a0c9956b5b23..cf0c47a26530 100644
+--- a/net/ax25/ax25_ip.c
++++ b/net/ax25/ax25_ip.c
+@@ -232,24 +232,9 @@ int ax25_rebuild_header(struct sk_buff *skb)
+
+ #endif
+
+-static bool ax25_validate_header(const char *header, unsigned int len)
+-{
+- ax25_digi digi;
+-
+- if (!len)
+- return false;
+-
+- if (header[0])
+- return true;
+-
+- return ax25_addr_parse(header + 1, len - 1, NULL, NULL, &digi, NULL,
+- NULL);
+-}
+-
+ const struct header_ops ax25_header_ops = {
+ .create = ax25_hard_header,
+ .rebuild = ax25_rebuild_header,
+- .validate = ax25_validate_header,
+ };
+
+ EXPORT_SYMBOL(ax25_hard_header);
diff --git a/debian/patches/bugfix/all/revert-net-validate-variable-length-ll-headers.patch b/debian/patches/bugfix/all/revert-net-validate-variable-length-ll-headers.patch
new file mode 100644
index 0000000..d29fe5f
--- /dev/null
+++ b/debian/patches/bugfix/all/revert-net-validate-variable-length-ll-headers.patch
@@ -0,0 +1,55 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 1 May 2016 18:00:43 +0200
+Subject: Revert "net: validate variable length ll headers"
+
+This reverts commit b5518429e70cd783b8ca52335456172c1a0589f6, which was
+commit 2793a23aacbd754dbbb5cb75093deb7e4103bace upstream. It is
+pointless unless af_packet calls the new function.
+---
+ include/linux/netdevice.h | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -262,7 +262,6 @@ struct header_ops {
+ void (*cache_update)(struct hh_cache *hh,
+ const struct net_device *dev,
+ const unsigned char *haddr);
+- bool (*validate)(const char *ll_header, unsigned int len);
+ };
+
+ /* These flag bits are private to the generic network queueing
+@@ -1348,7 +1347,7 @@ struct net_device {
+
+ unsigned int mtu; /* interface MTU value */
+ unsigned short type; /* interface hardware type */
+- unsigned short hard_header_len; /* maximum hardware hdr length */
++ unsigned short hard_header_len; /* hardware hdr length */
+
+ /* extra head- and tailroom the hardware may need, but not in all cases
+ * can this be guaranteed, especially tailroom. Some cases also use
+@@ -2072,24 +2071,6 @@ static inline int dev_rebuild_header(str
+ return dev->header_ops->rebuild(skb);
+ }
+
+-/* ll_header must have at least hard_header_len allocated */
+-static inline bool dev_validate_header(const struct net_device *dev,
+- char *ll_header, int len)
+-{
+- if (likely(len >= dev->hard_header_len))
+- return true;
+-
+- if (capable(CAP_SYS_RAWIO)) {
+- memset(ll_header + len, 0, dev->hard_header_len - len);
+- return true;
+- }
+-
+- if (dev->header_ops && dev->header_ops->validate)
+- return dev->header_ops->validate(ll_header, len);
+-
+- return false;
+-}
+-
+ typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len);
+ int register_gifconf(unsigned int family, gifconf_func_t *gifconf);
+ static inline int unregister_gifconf(unsigned int family)
diff --git a/debian/patches/debian/bpf-fix-abi-change-in-3.16.35.patch b/debian/patches/debian/bpf-fix-abi-change-in-3.16.35.patch
new file mode 100644
index 0000000..eb745e9
--- /dev/null
+++ b/debian/patches/debian/bpf-fix-abi-change-in-3.16.35.patch
@@ -0,0 +1,28 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 08 May 2016 01:34:11 +0100
+Subject: bpf: Fix ABI change in 3.16.35
+Forwarded: not-needed
+
+There are no longer any in-tree modular users of the old
+sk_{attach,detach}_filter() function, but perhaps there could be out
+of tree. Anyway, it costs little to add the exports back.
+
+--
+--- a/net/core/filter.c
++++ b/net/core/filter.c
+@@ -1644,6 +1644,7 @@ int sk_attach_filter(struct sock_fprog *
+ {
+ return __sk_attach_filter(fprog, sk, sock_owned_by_user(sk));
+ }
++EXPORT_SYMBOL_GPL(sk_attach_filter);
+
+ int __sk_detach_filter(struct sock *sk, bool locked)
+ {
+@@ -1668,6 +1669,7 @@ int sk_detach_filter(struct sock *sk)
+ {
+ return __sk_detach_filter(sk, sock_owned_by_user(sk));
+ }
++EXPORT_SYMBOL_GPL(sk_detach_filter);
+
+ int sk_get_filter(struct sock *sk, struct sock_filter __user *ubuf,
+ unsigned int len)
diff --git a/debian/patches/debian/fs-fix-abi-change-in-3.16.35.patch b/debian/patches/debian/fs-fix-abi-change-in-3.16.35.patch
new file mode 100644
index 0000000..a98d850
--- /dev/null
+++ b/debian/patches/debian/fs-fix-abi-change-in-3.16.35.patch
@@ -0,0 +1,60 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 01 May 2016 15:39:07 +0200
+Subject: fs: Fix ABI change in 3.16.35
+Forwarded: not-needed
+
+file_open_root() gained an extra parameter to set the file mode.
+Restore the old function signature and define a separate function,
+file_open_root_umode(), that takes the extra parameter.
+
+---
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -947,8 +947,8 @@ struct file *filp_open(const char *filen
+ }
+ EXPORT_SYMBOL(filp_open);
+
+-struct file *file_open_root(struct dentry *dentry, struct vfsmount *mnt,
+- const char *filename, int flags, umode_t mode)
++struct file *file_open_root_umode(struct dentry *dentry, struct vfsmount *mnt,
++ const char *filename, int flags, umode_t mode)
+ {
+ struct open_flags op;
+ int err = build_open_flags(flags, mode, &op);
+@@ -959,7 +959,7 @@ struct file *file_open_root(struct dentr
+ return ERR_PTR(-ENOTDIR);
+ return do_file_open_root(dentry, mnt, filename, &op);
+ }
+-EXPORT_SYMBOL(file_open_root);
++EXPORT_SYMBOL(file_open_root_umode);
+
+ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
+ {
+@@ -1106,3 +1106,13 @@ int nonseekable_open(struct inode *inode
+ }
+
+ EXPORT_SYMBOL(nonseekable_open);
++
++#undef file_open_root
++struct file *file_open_root(struct dentry *dentry, struct vfsmount *mnt,
++ const char *filename, int flags)
++{
++ if (flags & O_CREAT)
++ return ERR_PTR(-EINVAL);
++ return file_open_root_umode(dentry, mnt, filename, flags, 0);
++}
++EXPORT_SYMBOL(file_open_root);
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -2055,7 +2055,10 @@ extern long do_sys_open(int dfd, const c
+ extern struct file *file_open_name(struct filename *, int, umode_t);
+ extern struct file *filp_open(const char *, int, umode_t);
+ extern struct file *file_open_root(struct dentry *, struct vfsmount *,
+- const char *, int, umode_t);
++ const char *, int);
++extern struct file *file_open_root_umode(struct dentry *, struct vfsmount *,
++ const char *, int, umode_t);
++#define file_open_root file_open_root_umode
+ extern struct file * dentry_open(const struct path *, int, const struct cred *);
+ extern int filp_close(struct file *, fl_owner_t id);
+
diff --git a/debian/patches/debian/pci-fix-abi-change-in-3.16.7-ckt3.patch b/debian/patches/debian/pci-fix-abi-changes-in-3.16.y.patch
similarity index 77%
rename from debian/patches/debian/pci-fix-abi-change-in-3.16.7-ckt3.patch
rename to debian/patches/debian/pci-fix-abi-changes-in-3.16.y.patch
index 7becac7..59d4067 100644
--- a/debian/patches/debian/pci-fix-abi-change-in-3.16.7-ckt3.patch
+++ b/debian/patches/debian/pci-fix-abi-changes-in-3.16.y.patch
@@ -1,14 +1,16 @@
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Mon, 29 Dec 2014 00:59:35 +0100
-Subject: PCI: Avoid ABI change in 3.16.7-ckt3
+Date: Sat, 07 May 2016 21:19:08 +0100
+Subject: PCI: Avoid ABI changes in 3.16.y
Forwarded: not-needed
Move the added bitfield pci_dev::no_64bit_msi to the end of its
bitfield group and hide it from genksyms.
+Also hide pci_dev::non_compliant_bars from genksyms.
+
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
-@@ -331,7 +331,6 @@ struct pci_dev {
+@@ -335,7 +335,6 @@ struct pci_dev {
unsigned int is_added:1;
unsigned int is_busmaster:1; /* device is busmaster */
unsigned int no_msi:1; /* device may not use msi */
@@ -16,13 +18,14 @@ bitfield group and hide it from genksyms.
unsigned int block_cfg_access:1; /* config space access is blocked */
unsigned int broken_parity_status:1; /* Device generates false positive parity */
unsigned int irq_reroute_variant:2; /* device needs IRQ rerouting variant */
-@@ -349,6 +348,10 @@ struct pci_dev {
+@@ -353,7 +352,11 @@ struct pci_dev {
unsigned int __aer_firmware_first:1;
unsigned int broken_intx_masking:1;
unsigned int io_window_1k:1; /* Intel P2P bridge 1K I/O windows */
+#ifndef __GENKSYMS__
+ unsigned int no_64bit_msi:1; /* device may only use 32-bit MSIs */
-+ /* 8 bits spare */
+ unsigned int non_compliant_bars:1; /* broken BARs; ignore them */
++ /* 7 bits spare */
+#endif
pci_dev_flags_t dev_flags;
atomic_t enable_cnt; /* pci_enable_device has been called */
diff --git a/debian/patches/series b/debian/patches/series
index 04ff4fc..68afd85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -185,7 +185,6 @@ features/x86/ie31200_edac-introduce-the-driver.patch
features/x86/ie31200_edac-allocate-mci-and-map-mchbar-first.patch
# Miscellaneous bug fixes
-bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
bugfix/all/disable-some-marvell-phys.patch
debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
@@ -614,7 +613,7 @@ debian/iovec-fix-abi-change-in-3.16.7-ckt1.patch
debian/truncate-fix-abi-change-in-3.16.7-ckt1.patch
debian/perf-fix-abi-change-in-3.16.7-ckt2.patch
debian/arm-thread_info-fix-abi-change-in-3.16.7-ckt3.patch
-debian/pci-fix-abi-change-in-3.16.7-ckt3.patch
+debian/pci-fix-abi-changes-in-3.16.y.patch
debian/vfs-avoid-abi-change-for-dentry-union-changes.patch
debian/userns-fix-abi-change-in-3.16.7-ckt4.patch
debian/revert-quota-store-maximum-space-limit-in-bytes.patch
@@ -659,3 +658,7 @@ debian/revert-net-ipv6-add-sysctl-option-accept_ra_min_hop_limit.patch
debian/revert-libata-align-ata_device-s-id-on-a-cacheline.patch
debian/tracing-avoid-abi-change-in-3.16.7-ckt26.patch
debian/route-fix-abi-change-in-3.16.7-ckt26.patch
+debian/fs-fix-abi-change-in-3.16.35.patch
+bugfix/all/revert-ax25-add-link-layer-header-validation-functio.patch
+bugfix/all/revert-net-validate-variable-length-ll-headers.patch
+debian/bpf-fix-abi-change-in-3.16.35.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list