[kernel] r22238 - in dists/sid/linux/debian: . config patches patches/bugfix/all patches/bugfix/arm64 patches/bugfix/x86 patches/debian
Ben Hutchings
benh at moszumanska.debian.org
Fri Jan 2 03:44:17 UTC 2015
Author: benh
Date: Fri Jan 2 03:44:16 2015
New Revision: 22238
Log:
Update to 3.16.7-ckt3
- Drop various patches that were applied upstream
- Refresh the big firmware logging patch
- Fix/ignore ABI changes as appropriate
Added:
dists/sid/linux/debian/patches/debian/arm-thread_info-fix-abi-change-in-3.16.7-ckt3.patch
dists/sid/linux/debian/patches/debian/pci-fix-abi-change-in-3.16.7-ckt3.patch
Deleted:
dists/sid/linux/debian/patches/bugfix/all/drivers-net-Disable-UFO-through-virtio.patch
dists/sid/linux/debian/patches/bugfix/all/drivers-net-ipv6-Select-IPv6-fragment-idents-for-vir.patch
dists/sid/linux/debian/patches/bugfix/all/fold-swapping-d_name.hash-into-switch_names.patch
dists/sid/linux/debian/patches/bugfix/all/of-fdt-memblock_reserve-memreserve-regions-in-the-ca.patch
dists/sid/linux/debian/patches/bugfix/all/revert-drivers-net-disable-ufo-through-virtio-in-macvtap-and-tun.patch
dists/sid/linux/debian/patches/bugfix/all/vfs-Don-t-exchange-short-filenames-unconditionally.patch
dists/sid/linux/debian/patches/bugfix/arm64/arm64-crypto-fix-makefile-rule-for-aes-glue-.o.patch
dists/sid/linux/debian/patches/bugfix/x86/x86-asm-traps-Disable-tracing-and-kprobes-in-fixup_b.patch
dists/sid/linux/debian/patches/bugfix/x86/x86_64-traps-Fix-the-espfix64-DF-fixup-and-rewrite-i.patch
dists/sid/linux/debian/patches/bugfix/x86/x86_64-traps-Rework-bad_iret.patch
dists/sid/linux/debian/patches/bugfix/x86/x86_64-traps-Stop-using-IST-for-SS.patch
Modified:
dists/sid/linux/debian/changelog
dists/sid/linux/debian/config/defines
dists/sid/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
dists/sid/linux/debian/patches/series
Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog Tue Dec 30 14:31:05 2014 (r22237)
+++ dists/sid/linux/debian/changelog Fri Jan 2 03:44:16 2015 (r22238)
@@ -1,11 +1,99 @@
-linux (3.16.7-ckt2-2) UNRELEASED; urgency=medium
+linux (3.16.7-ckt3-1) UNRELEASED; urgency=medium
+
+ * New upstream stable update:
+ http://kernel.ubuntu.com/stable/ChangeLog-3.16.7-ckt3
+ - [x86] kvm: use alternatives for VMCALL vs. VMMCALL if kernel text is
+ read-only
+ - [sparc*] Fix constraints on swab helpers.
+ - inetdevice: fixed signed integer overflow
+ - ieee802154: fix error handling in ieee802154fake_probe()
+ - bonding: fix curr_active_slave/carrier with loadbalance arp monitoring
+ (regression in 3.14)
+ - pptp: fix stack info leak in pptp_getname()
+ - ipx: fix locking regression in ipx_sendmsg and ipx_recvmsg
+ - net/mlx4_en: Add VXLAN ndo calls to the PF net device ops too
+ (regression in 3.15)
+ - net/mlx4_en: Advertize encapsulation offloads features only when VXLAN
+ tunnel is set (regression in 3.15)
+ - target: Don't call TFO->write_pending if data_length == 0
+ - vhost-scsi: Take configfs group dependency during VHOST_SCSI_SET_ENDPOINT
+ - iser-target: Handle DEVICE_REMOVAL event on network portal listener
+ correctly
+ - ASoC: dpcm: Fix race between FE/BE updates and trigger
+ - mac80211: Fix regression that triggers a kernel BUG with CCMP
+ (regression in 3.13)
+ - rt2x00: do not align payload on modern H/W
+ - bitops: Fix shift overflow in GENMASK macros
+ - [x86] Require exact match for 'noxsave' command line option
+ - [x86] drm/i915: Kick fbdev before vgacon (regression in 3.16)
+ - can: dev: avoid calling kfree_skb() from interrupt context
+ - [x86] mm: Set NX across entire PMD at boot
+ - of: Fix crash if an earlycon driver is not found
+ - btrfs: fix lockups from btrfs_clear_path_blocking
+ - [i386/686-pae,armhf/armmp-lpae] PCI: Support 64-bit bridge windows if we
+ have 64-bit dma_addr_t (regression in 3.14)
+ - ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up
+ (regression in 3.13)
+ - drm/radeon: fix endian swapping in vbios fetch for tdp table
+ - Bluetooth: Fix endian and alignment issue with ath3k version handling
+ - nfs: Don't busy-wait on SIGKILL in __nfs_iocounter_wait
+ - [armhf] 8109/1: mm: Modify pte_write and pmd_write logic for LPAE
+ - aio: fix incorrect dirty pages accouting when truncating AIO ring buffer
+ (regression in 3.12)
+ - [armel,armhf] mvebu: add missing of_node_put() call in coherency.c
+ (regression in 3.16)
+ - iio: Fix IIO_EVENT_CODE_EXTRACT_DIR bit mask
+ - spi: Fix mapping from vmalloc-ed buffer to scatter list
+ - SUNRPC: Fix locking around callback channel reply receive
+ - nfsd: Fix slot wake up race in the nfsv4.1 callback code
+ - bnx2fc: do not add shared skbs to the fcoe_rx_list
+ - Revert "xhci: clear root port wake on bits if controller isn't wake-up
+ capable" (regression in 3.16)
+ - usb: xhci: rework root port wake bits if controller isn't allowed to
+ wakeup
+ - ixgbe: Correctly disable VLAN filter in promiscuous mode
+ (regression in 3.16)
+ - ixgbe: fix use after free adapter->state test in ixgbe_remove/ixgbe_probe
+ (regression in 3.15)
+ - ALSA: hda - Limit 40bit DMA for AMD HDMI controllers
+ - PCI/MSI: Add device flag indicating that 64-bit MSIs don't work
+ - gpu/radeon: Set flag to indicate broken 64-bit MSI
+ - sound/radeon: Move 64-bit MSI quirk from arch to driver
+ - [powerpc*] pseries: Honor the generic "no_64bit_msi" flag
+ - [mips*] fix EVA & non-SMP non-FPU FP context signal handling
+ (regression in 3.15)
+ - [x86] drm/i915: Ignore SURFLIVE and flip counter when the GPU gets reset
+ (regression in 3.16)
+ - [powerpc*] 32 bit getcpu VDSO function uses 64 bit instructions
+ - [armhf] 8222/1: mvebu: enable strex backoff delay
+ - [armel,armhf] 8226/1: cacheflush: get rid of restarting block
+ - btrfs: zero out left over bytes after processing compression streams
+ - [armhf] net: sun4i-emac: fix memory leak on bad packet
+ - [armhf] i2c: omap: fix NACK and Arbitration Lost irq handling
+ - [media] s2255drv: fix payload size for JPG, MJPEG (regression in 3.15)
+ - nouveau: move the hotplug ignore to correct place. (regression in 3.16.4)
+ - mm: frontswap: invalidate expired data on a dup-store failure
+ - mm/vmpressure.c: fix race in vmpressure_work_fn()
+ - xen-netfront: Remove BUGs on paged skb data which crosses a page boundary
+ - drivers/input/evdev.c: don't kfree() a vmalloc address
+ (regression in 3.13)
+ - mm: fix anon_vma_clone() error treatment (regression in 3.12)
+ - ip_tunnel: the lack of vti_link_ops' dellink() cause kernel panic
+ - vxlan: Fix race condition between vxlan_sock_add and vxlan_sock_release
+ - bond: Check length of IFLA_BOND_ARP_IP_TARGET attributes
+ - gre: Set inner mac header in gro complete (regression in 3.16.7-ckt1)
+ - [mips*] bpf: Fix broken BPF_MOD
[ Ben Hutchings ]
* [sh4] Build with gcc-4.8 (Closes: #772602)
* Fix inconsistent ABI name generation in
debian/bin/{abiupdate,buildcheck,gencontrol}.py (Closes: #773233)
* iov: Revert unwanted ABI 'fix' in 3.16.7-ckt2-1
- * Ignore ABI changes in mm, of functions not really used by modules
+ * [armel,armhf] thread_info: Fix ABI change in 3.16.7-ckt3
+ * PCI: Fix ABI change in 3.16.7-ckt3
+ * Ignore some ABI changes that don't appear to affect OOT modules:
+ - Removal of __add_pages(), __remove_pages(), of_device_is_stdout_path()
+ - Changes to ASoC functions
* [arm64] Enable PSTORE as built-in and EFI_VARS_PSTORE as module;
ensure efivars and efi-pstore are loaded on EFI systems (Closes: #773309)
Modified: dists/sid/linux/debian/config/defines
==============================================================================
--- dists/sid/linux/debian/config/defines Tue Dec 30 14:31:05 2014 (r22237)
+++ dists/sid/linux/debian/config/defines Fri Jan 2 03:44:16 2015 (r22238)
@@ -9,6 +9,7 @@
__add_pages
__remove_pages
of_device_is_stdout_path
+ module:sound/soc/*
[base]
arches:
Modified: dists/sid/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Tue Dec 30 14:31:05 2014 (r22237)
+++ dists/sid/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Fri Jan 2 03:44:16 2015 (r22238)
@@ -96,8 +96,8 @@
fw_size = firmware->size / sizeof(u32);
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
-@@ -370,10 +370,8 @@ static int ath3k_load_patch(struct usb_d
- le32_to_cpu(fw_version.rom_version));
+@@ -377,10 +377,8 @@ static int ath3k_load_patch(struct usb_d
+ le32_to_cpu(fw_version.rom_version));
ret = request_firmware(&firmware, filename, &udev->dev);
- if (ret < 0) {
@@ -106,9 +106,9 @@
return ret;
- }
- pt_version.rom_version = *(int *)(firmware->data + firmware->size - 8);
- pt_version.build_version = *(int *)
-@@ -432,10 +430,8 @@ static int ath3k_load_syscfg(struct usb_
+ pt_rom_version = get_unaligned_le32(firmware->data +
+ firmware->size - 8);
+@@ -440,10 +438,8 @@ static int ath3k_load_syscfg(struct usb_
le32_to_cpu(fw_version.rom_version), clk_value, ".dfu");
ret = request_firmware(&firmware, filename, &udev->dev);
@@ -168,7 +168,7 @@
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
-@@ -288,8 +288,6 @@ static int btmrvl_sdio_download_helper(s
+@@ -293,8 +293,6 @@ static int btmrvl_sdio_download_helper(s
ret = request_firmware(&fw_helper, card->helper,
&card->func->dev);
if ((ret < 0) || !fw_helper) {
@@ -177,7 +177,7 @@
ret = -ENOENT;
goto done;
}
-@@ -388,8 +386,6 @@ static int btmrvl_sdio_download_fw_w_hel
+@@ -393,8 +391,6 @@ static int btmrvl_sdio_download_fw_w_hel
ret = request_firmware(&fw_firmware, card->firmware,
&card->func->dev);
if ((ret < 0) || !fw_firmware) {
@@ -203,7 +203,7 @@
fw->size, fw_name);
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
-@@ -1269,10 +1269,8 @@ static void sdma_load_firmware(const str
+@@ -1281,10 +1281,8 @@ static void sdma_load_firmware(const str
const struct sdma_script_start_addrs *addr;
unsigned short *ram_code;
@@ -232,7 +232,7 @@
where = 0;
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
-@@ -1221,10 +1221,8 @@ nvc0_graph_ctor_fw(struct nvc0_graph_pri
+@@ -1248,10 +1248,8 @@ nvc0_graph_ctor_fw(struct nvc0_graph_pri
if (ret) {
snprintf(f, sizeof(f), "nouveau/%s", fwname);
ret = request_firmware(&fw, f, nv_device_base(device));
@@ -274,7 +274,7 @@
release_firmware(rdev->me_fw);
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
-@@ -1036,10 +1036,7 @@ static int r100_cp_init_microcode(struct
+@@ -1017,10 +1017,7 @@ static int r100_cp_init_microcode(struct
}
err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);
@@ -288,7 +288,7 @@
rdev->me_fw->size, fw_name);
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
-@@ -2434,10 +2434,6 @@ int r600_init_microcode(struct radeon_de
+@@ -2427,10 +2427,6 @@ int r600_init_microcode(struct radeon_de
out:
if (err) {
@@ -685,7 +685,7 @@
printk(KERN_INFO "tda1004x: please rename the firmware file to %s\n",
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
-@@ -952,12 +952,8 @@ static int tda10071_init(struct dvb_fron
+@@ -956,12 +956,8 @@ static int tda10071_init(struct dvb_fron
/* request the firmware, this will block and timeout */
ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent);
@@ -835,7 +835,7 @@
fw_data = (void *)fw_entry->data;
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
-@@ -3814,10 +3814,8 @@ static int pvr_boot(struct bttv *btv)
+@@ -3834,10 +3834,8 @@ static int pvr_boot(struct bttv *btv)
int rc;
rc = request_firmware(&fw_entry, "hcwamc.rbf", &btv->c.pci->dev);
@@ -1061,7 +1061,7 @@
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
-@@ -2306,10 +2306,8 @@ static int s2255_probe(struct usb_interf
+@@ -2305,10 +2305,8 @@ static int s2255_probe(struct usb_interf
}
/* load the first chunk */
if (request_firmware(&dev->fw_data->fw,
@@ -1240,7 +1240,7 @@
if (bp->mips_firmware->size < sizeof(*mips_fw) ||
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-@@ -12775,11 +12775,8 @@ static int bnx2x_init_firmware(struct bn
+@@ -12738,11 +12738,8 @@ static int bnx2x_init_firmware(struct bn
BNX2X_DEV_INFO("Loading %s\n", fw_file_name);
rc = request_firmware(&bp->firmware, fw_file_name, &bp->pdev->dev);
@@ -1255,7 +1255,7 @@
if (rc) {
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -11286,11 +11286,8 @@ static int tg3_request_firmware(struct t
+@@ -11323,11 +11323,8 @@ static int tg3_request_firmware(struct t
{
const struct tg3_firmware_hdr *fw_hdr;
@@ -1431,7 +1431,7 @@
} else
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
-@@ -1553,13 +1553,8 @@ static struct fwentry *at76_load_firmwar
+@@ -1622,13 +1622,8 @@ static struct fwentry *at76_load_firmwar
at76_dbg(DBG_FW, "downloading firmware %s", fwe->fwname);
ret = request_firmware(&fwe->fw, fwe->fwname, &udev->dev);
@@ -1464,7 +1464,7 @@
&hif_dev->udev->dev);
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
-@@ -1025,7 +1025,6 @@ static void carl9170_usb_firmware_step2(
+@@ -1032,7 +1032,6 @@ static void carl9170_usb_firmware_step2(
return;
}
@@ -1490,7 +1490,7 @@
int success = 0;
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -2160,19 +2160,8 @@ int b43_do_request_fw(struct b43_request
+@@ -2154,19 +2154,8 @@ int b43_do_request_fw(struct b43_request
}
err = request_firmware(&ctx->blob, ctx->fwname,
ctx->dev->dev->dev);
@@ -1714,7 +1714,7 @@
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
-@@ -1690,7 +1690,6 @@ static int ezusb_probe(struct usb_interf
+@@ -1676,7 +1676,6 @@ static int ezusb_probe(struct usb_interf
if (ezusb_firmware_download(upriv, &firmware) < 0)
goto error;
} else {
@@ -1968,7 +1968,7 @@
--- a/drivers/scsi/pm8001/pm8001_ctl.c
+++ b/drivers/scsi/pm8001/pm8001_ctl.c
-@@ -676,9 +676,6 @@ static ssize_t pm8001_store_update_fw(st
+@@ -679,9 +679,6 @@ static ssize_t pm8001_store_update_fw(st
pm8001_ha->dev);
if (err) {
@@ -1991,7 +1991,7 @@
}
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
-@@ -5358,8 +5358,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
+@@ -5352,8 +5352,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
@@ -2000,7 +2000,7 @@
ql_log(ql_log_info, vha, 0x0084,
"Firmware images can be retrieved from: "QLA_FW_URL ".\n");
return QLA_FUNCTION_FAILED;
-@@ -5461,8 +5459,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
+@@ -5455,8 +5453,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
@@ -2011,7 +2011,7 @@
QLA_FW_URL ".\n");
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
-@@ -2449,11 +2449,8 @@ try_blob_fw:
+@@ -2459,11 +2459,8 @@ try_blob_fw:
/* Load firmware blob. */
blob = ha->hablob = qla2x00_request_firmware(vha);
@@ -2026,7 +2026,7 @@
if (qla82xx_validate_firmware_blob(vha,
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -5393,8 +5393,6 @@ qla2x00_request_firmware(scsi_qla_host_t
+@@ -5403,8 +5403,6 @@ qla2x00_request_firmware(scsi_qla_host_t
goto out;
if (request_firmware(&blob->fw, blob->name, &ha->pdev->dev)) {
@@ -2208,7 +2208,7 @@
usb_set_intfdata(pusb_intf, NULL);
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
-@@ -402,11 +402,8 @@ static int slic_card_download_gbrcv(stru
+@@ -393,11 +393,8 @@ static int slic_card_download_gbrcv(stru
}
ret = request_firmware(&fw, file, &adapter->pcidev->dev);
@@ -2221,7 +2221,7 @@
rcvucodelen = *(u32 *)(fw->data + index);
index += 4;
-@@ -480,11 +477,8 @@ static int slic_card_download(struct ada
+@@ -471,11 +468,8 @@ static int slic_card_download(struct ada
return -ENOENT;
}
ret = request_firmware(&fw, file, &adapter->pcidev->dev);
@@ -2236,7 +2236,7 @@
for (i = 0; i < numsects; i++) {
--- a/drivers/staging/vt6656/firmware.c
+++ b/drivers/staging/vt6656/firmware.c
-@@ -57,11 +57,8 @@ int FIRMWAREbDownload(struct vnt_private
+@@ -56,11 +56,8 @@ int FIRMWAREbDownload(struct vnt_private
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Download firmware\n");
rc = request_firmware(&fw, FIRMWARE_NAME, dev);
@@ -2657,7 +2657,7 @@
filename, emu->firmware->size);
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
-@@ -1407,10 +1407,8 @@ static void azx_firmware_cb(const struct
+@@ -1449,10 +1449,8 @@ static void azx_firmware_cb(const struct
struct azx *chip = card->private_data;
struct pci_dev *pci = chip->pci;
Added: dists/sid/linux/debian/patches/debian/arm-thread_info-fix-abi-change-in-3.16.7-ckt3.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/arm-thread_info-fix-abi-change-in-3.16.7-ckt3.patch Fri Jan 2 03:44:16 2015 (r22238)
@@ -0,0 +1,35 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 29 Dec 2014 00:55:03 +0100
+Subject: ARM: thread_info: Avoid ABI change in 3.16.7-ckt3
+Forwarded: not-needed
+
+Restore thread_info::arm_restart_block even though it's now unused.
+
+--- a/arch/arm/include/asm/thread_info.h
++++ b/arch/arm/include/asm/thread_info.h
+@@ -43,6 +43,17 @@ struct cpu_context_save {
+ __u32 extra[2]; /* Xscale 'acc' register, etc */
+ };
+
++/* bwh: Retained only for ABI compatibility */
++struct arm_restart_block {
++ union {
++ /* For user cache flushing */
++ struct {
++ unsigned long start;
++ unsigned long end;
++ } cache;
++ };
++};
++
+ /*
+ * low level task data that entry.S needs immediate access to.
+ * __switch_to() assumes cpu_context follows immediately after cpu_domain.
+@@ -68,6 +79,7 @@ struct thread_info {
+ unsigned long thumbee_state; /* ThumbEE Handler Base register */
+ #endif
+ struct restart_block restart_block;
++ struct arm_restart_block arm_restart_block;
+ };
+
+ #define INIT_THREAD_INFO(tsk) \
Added: dists/sid/linux/debian/patches/debian/pci-fix-abi-change-in-3.16.7-ckt3.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/pci-fix-abi-change-in-3.16.7-ckt3.patch Fri Jan 2 03:44:16 2015 (r22238)
@@ -0,0 +1,29 @@
+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
+Forwarded: not-needed
+
+Move the added bitfield pci_dev::no_64bit_msi to the end of its
+bitfield group and hide it from genksyms.
+
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -331,7 +331,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 */
+- unsigned int no_64bit_msi:1; /* device may only use 32-bit MSIs */
+ 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 {
+ 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 */
++#endif
+ pci_dev_flags_t dev_flags;
+ atomic_t enable_cnt; /* pci_enable_device has been called */
+
Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series Tue Dec 30 14:31:05 2014 (r22237)
+++ dists/sid/linux/debian/patches/series Fri Jan 2 03:44:16 2015 (r22238)
@@ -52,17 +52,12 @@
bugfix/arm/ixp4xx_iobe.patch
bugfix/m68k/ethernat-kconfig.patch
bugfix/s390/s390-3215-fix-hanging-console-issue.patch
-bugfix/arm64/arm64-crypto-fix-makefile-rule-for-aes-glue-.o.patch
bugfix/s390/s390-3215-fix-tty-output-containing-tabs.patch
bugfix/x86/drm-i915-initialise-userptr-mmu_notifier-serial-to-1.patch
bugfix/x86/drm-i915-Add-some-L3-registers-to-the-parser-whiteli.patch
bugfix/parisc/parisc-reduce-sigrtmin-from-37-to-32-to-behave-like-.patch
bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch
bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch
-bugfix/x86/x86_64-traps-Stop-using-IST-for-SS.patch
-bugfix/x86/x86_64-traps-Fix-the-espfix64-DF-fixup-and-rewrite-i.patch
-bugfix/x86/x86_64-traps-Rework-bad_iret.patch
-bugfix/x86/x86-asm-traps-Disable-tracing-and-kprobes-in-fixup_b.patch
# Arch features
features/mips/MIPS-Support-hard-limit-of-cpu-count-nr_cpu_ids.patch
@@ -136,13 +131,8 @@
bugfix/all/disable-some-marvell-phys.patch
debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch
-bugfix/all/fold-swapping-d_name.hash-into-switch_names.patch
-bugfix/all/vfs-Don-t-exchange-short-filenames-unconditionally.patch
bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch
bugfix/all/HID-i2c-hid-call-the-hid-driver-s-suspend-and-resume.patch
-bugfix/all/drivers-net-Disable-UFO-through-virtio.patch
-bugfix/all/drivers-net-ipv6-Select-IPv6-fragment-idents-for-vir.patch
-bugfix/all/revert-drivers-net-disable-ufo-through-virtio-in-macvtap-and-tun.patch
bugfix/all/xen-netback-Adding-debugfs-io_ring_qX-files.patch
bugfix/all/xen-netback-Using-a-new-state-bit-instead-of-carrier.patch
bugfix/all/xen-netback-Turn-off-the-carrier-if-the-guest-is-not.patch
@@ -161,7 +151,6 @@
bugfix/all/xen-netback-do-not-report-success-if-backend_create_.patch
bugfix/all/netback-don-t-store-invalid-vif-pointer.patch
bugfix/all/xen-netback-support-frontends-without-feature-rx-not.patch
-bugfix/all/of-fdt-memblock_reserve-memreserve-regions-in-the-ca.patch
# memfd_create() & kdbus backport
features/all/kdbus/mm-allow-drivers-to-prevent-new-writable-mappings.patch
@@ -491,3 +480,5 @@
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
More information about the Kernel-svn-changes
mailing list