[kernel] r21840 - in dists/trunk/linux/debian: . patches patches/bugfix/all patches/bugfix/mips patches/bugfix/s390 patches/debian patches/debian/dfsg patches/features/all patches/features/arm64 patches/features/mips patches/features/powerpc
Ben Hutchings
benh at moszumanska.debian.org
Sat Sep 13 06:23:27 UTC 2014
Author: benh
Date: Sat Sep 13 06:23:27 2014
New Revision: 21840
Log:
Update to 3.17-rc4
- Drop and refresh various patches which are included in or conflict with
upstream
- Drop the patch restoring sm7xxfb, as no-one is maintaining it
- Disable aufs temporarily
Deleted:
dists/trunk/linux/debian/patches/bugfix/all/aio-fix-reqs_available-handling.patch
dists/trunk/linux/debian/patches/bugfix/all/libceph-add-process_one_ticket-helper.patch
dists/trunk/linux/debian/patches/bugfix/all/libceph-do-not-hard-code-max-auth-ticket-len.patch
dists/trunk/linux/debian/patches/bugfix/all/libceph-gracefully-handle-large-reply-messages-from-.patch
dists/trunk/linux/debian/patches/bugfix/all/libceph-set-last_piece-in-ceph_msg_data_pages_cursor.patch
dists/trunk/linux/debian/patches/bugfix/all/mnt-Add-tests-for-unprivileged-remount-cases-that-ha.patch
dists/trunk/linux/debian/patches/bugfix/all/mnt-Change-the-default-remount-atime-from-relatime-t.patch
dists/trunk/linux/debian/patches/bugfix/all/mnt-Correct-permission-checks-in-do_remount.patch
dists/trunk/linux/debian/patches/bugfix/all/mnt-Move-the-test-for-MNT_LOCK_READONLY-from-change_.patch
dists/trunk/linux/debian/patches/bugfix/all/mnt-Only-change-user-settable-mount-flags-in-remount.patch
dists/trunk/linux/debian/patches/bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch
dists/trunk/linux/debian/patches/bugfix/mips/MIPS-OCTEON-make-get_system_type-thread-safe.patch
dists/trunk/linux/debian/patches/bugfix/mips/MIPS-Remove-BUG_ON-is_fpu_owner-in-do_ade.patch
dists/trunk/linux/debian/patches/bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch
dists/trunk/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch
dists/trunk/linux/debian/patches/bugfix/s390/s390-3215-fix-hanging-console-issue.patch
dists/trunk/linux/debian/patches/debian/revert-staging-sm7xxfb-remove-driver.patch
dists/trunk/linux/debian/patches/features/all/virtio-scsi-Implement-change_queue_depth-for-virtscs.patch
dists/trunk/linux/debian/patches/features/arm64/drivers-net-Add-APM-X-Gene-SoC-ethernet-driver-suppo.patch
dists/trunk/linux/debian/patches/features/arm64/dts-Add-bindings-for-APM-X-Gene-SoC-ethernet-driver.patch
dists/trunk/linux/debian/patches/features/arm64/net-xgene-Check-negative-return-value-of-xgene_enet_.patch
dists/trunk/linux/debian/patches/features/arm64/net-xgene-fix-possible-NULL-dereference-in-xgene_ene.patch
dists/trunk/linux/debian/patches/features/mips/MIPS-Add-Loongson-3B-support.patch
dists/trunk/linux/debian/patches/features/mips/MIPS-Add-NUMA-support-for-Loongson-3.patch
dists/trunk/linux/debian/patches/features/mips/MIPS-Add-numa-api-support.patch
dists/trunk/linux/debian/patches/features/mips/MIPS-Loongson-3-Enable-the-COP2-usage.patch
dists/trunk/linux/debian/patches/features/mips/MIPS-Loongson-Modify-ChipConfig-register-definition.patch
dists/trunk/linux/debian/patches/features/mips/MIPS-Loongson-Rename-CONFIG_LEMOTE_MACH3A-to-CONFIG_.patch
dists/trunk/linux/debian/patches/features/mips/MIPS-Support-CPU-topology-files-in-sysfs.patch
dists/trunk/linux/debian/patches/features/mips/MIPS-Support-hard-limit-of-cpu-count-nr_cpu_ids.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-Allow-KVM_CHECK_EXTENSION-on-the-vm-fd.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-Don-t-keep-reference-to-irq-routing-table-in-irq.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-Give-IRQFD-its-own-separate-enabling-Kconfig-opt.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-Move-all-accesses-to-kvm-irq_routing-into-irqchi.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-Move-irq-notifier-implementation-into-eventfd.c.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3S-Controls-for-in-kernel-sPAPR-hypercal.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3S-HV-Access-XICS-in-BE.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3S-HV-Access-guest-VPA-in-BE.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3S-HV-Access-host-lppaca-and-shadow-slb-.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3S-HV-Enable-for-little-endian-hosts.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3S-HV-Fix-ABIv2-indirect-branch-issue.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3S-HV-Fix-ABIv2-on-LE.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3S-HV-Make-HTAB-code-LE-host-aware.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3S-PR-Fix-sparse-endian-checks.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3S-PR-Handle-hyp-doorbell-exits.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3s-HV-Fix-tlbie-compile-error.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Book3s-PR-Disable-AIL-mode-with-OPAL.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-PPC-Enable-IRQFD-support-for-the-XICS-interrupt-.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-Rename-and-add-argument-to-check_extension.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-irqchip-Provide-and-use-accessors-for-irq-routin.patch
dists/trunk/linux/debian/patches/features/powerpc/KVM-prepare-for-KVM_-S-G-ET_MP_STATE-on-other-archit.patch
dists/trunk/linux/debian/patches/features/powerpc/PPC-Add-asm-helpers-for-BE-32bit-load-store.patch
Modified:
dists/trunk/linux/debian/changelog
dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
dists/trunk/linux/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch
dists/trunk/linux/debian/patches/bugfix/all/firmware_class-return-specific-errors-from-file-read.patch
dists/trunk/linux/debian/patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
dists/trunk/linux/debian/patches/bugfix/mips/disable-advansys.patch
dists/trunk/linux/debian/patches/debian/dfsg/files-1
dists/trunk/linux/debian/patches/debian/ia64-hardcode-arch-script-output.patch
dists/trunk/linux/debian/patches/debian/version.patch
dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
dists/trunk/linux/debian/patches/features/all/efi-autoload-efivars.patch
dists/trunk/linux/debian/patches/series
dists/trunk/linux/debian/patches/series-orig
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/changelog Sat Sep 13 06:23:27 2014 (r21840)
@@ -1,3 +1,9 @@
+linux (3.17~rc4-1~exp1) UNRELEASED; urgency=medium
+
+ * New upstream release candidate
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 13 Sep 2014 06:42:35 +0100
+
linux (3.16.2-3) unstable; urgency=medium
[ Ben Hutchings ]
Modified: dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Sat Sep 13 06:23:27 2014 (r21840)
@@ -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));
+@@ -375,10 +375,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);
+@@ -438,10 +436,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
+@@ -297,8 +297,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
+@@ -397,8 +395,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
+@@ -1286,10 +1286,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
+@@ -1496,10 +1496,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
+@@ -1012,10 +1012,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
+@@ -2426,10 +2426,6 @@ int r600_init_microcode(struct radeon_de
out:
if (err) {
@@ -342,7 +342,7 @@
ret = qib_ibsd_ucode_loaded(dd->pport, fw);
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
-@@ -1236,10 +1236,8 @@ static int mxt_load_fw(struct device *de
+@@ -1932,10 +1932,8 @@ static int mxt_load_fw(struct device *de
int ret;
ret = request_firmware(&fw, fn, dev);
@@ -381,7 +381,7 @@
}
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
-@@ -2256,12 +2256,9 @@ static int stk9090m_frontend_attach(stru
+@@ -2372,12 +2372,9 @@ static int stk9090m_frontend_attach(stru
dib9000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x10, 0x80);
@@ -396,7 +396,7 @@
stk9090m_config.microcode_B_fe_size = state->frontend_firmware->size;
stk9090m_config.microcode_B_fe_buffer = state->frontend_firmware->data;
-@@ -2322,12 +2319,9 @@ static int nim9090md_frontend_attach(str
+@@ -2438,12 +2435,9 @@ static int nim9090md_frontend_attach(str
msleep(20);
dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);
@@ -468,7 +468,7 @@
p = kmalloc(fw->size, GFP_KERNEL);
--- a/drivers/media/dvb-frontends/af9013.c
+++ b/drivers/media/dvb-frontends/af9013.c
-@@ -1373,16 +1373,8 @@ static int af9013_download_firmware(stru
+@@ -1372,16 +1372,8 @@ static int af9013_download_firmware(stru
/* request the firmware, this will block and timeout */
ret = request_firmware(&fw, fw_file, state->i2c->dev.parent);
@@ -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);
@@ -701,7 +701,7 @@
for (i = 0; i < ARRAY_SIZE(tab2); i++) {
--- a/drivers/media/pci/ngene/ngene-core.c
+++ b/drivers/media/pci/ngene/ngene-core.c
-@@ -1266,13 +1266,8 @@ static int ngene_load_firm(struct ngene
+@@ -1262,13 +1262,8 @@ static int ngene_load_firm(struct ngene
break;
}
@@ -716,7 +716,7 @@
if (size == 0)
size = fw->size;
if (size != fw->size) {
-@@ -1280,8 +1275,6 @@ static int ngene_load_firm(struct ngene
+@@ -1276,8 +1271,6 @@ static int ngene_load_firm(struct ngene
": Firmware %s has invalid size!", fw_name);
err = -1;
} else {
@@ -791,7 +791,7 @@
b[0] = 0xaa;
--- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
-@@ -1302,11 +1302,8 @@ static int ttusb_dec_boot_dsp(struct ttu
+@@ -1297,11 +1297,8 @@ static int ttusb_dec_boot_dsp(struct ttu
dprintk("%s\n", __func__);
result = request_firmware(&fw_entry, dec->firmware_name, &dec->udev->dev);
@@ -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);
@@ -958,7 +958,7 @@
printk(KERN_ERR "ERROR: Firmware size mismatch "
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
-@@ -1905,11 +1905,7 @@ void cx23885_card_setup(struct cx23885_d
+@@ -1958,11 +1958,7 @@ void cx23885_card_setup(struct cx23885_d
cinfo.rev, filename);
ret = request_firmware(&fw, filename, &dev->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
+@@ -2304,10 +2304,8 @@ static int s2255_probe(struct usb_interf
}
/* load the first chunk */
if (request_firmware(&dev->fw_data->fw,
@@ -1075,22 +1075,10 @@
pdata = (__le32 *) &dev->fw_data->fw->data[fw_size - 8];
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
-@@ -86,10 +86,8 @@ int s5p_mfc_load_firmware(struct s5p_mfc
-
- err = request_firmware((const struct firmware **)&fw_blob,
- dev->variant->fw_name, dev->v4l2_dev.dev);
-- if (err != 0) {
-- mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n");
-+ if (err != 0)
- return -EINVAL;
-- }
- if (fw_blob->size > dev->fw_size) {
- mfc_err("MFC firmware is too big to be loaded\n");
- release_firmware(fw_blob);
-@@ -119,10 +117,8 @@ int s5p_mfc_reload_firmware(struct s5p_m
+@@ -94,10 +94,8 @@ int s5p_mfc_load_firmware(struct s5p_mfc
+ }
+ }
- err = request_firmware((const struct firmware **)&fw_blob,
- dev->variant->fw_name, dev->v4l2_dev.dev);
- if (err != 0) {
- mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n");
+ if (err != 0)
@@ -1130,7 +1118,7 @@
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
-@@ -301,11 +301,8 @@ static long download_firmware(struct kim
+@@ -302,11 +302,8 @@ static long download_firmware(struct kim
request_firmware(&kim_gdata->fw_entry, bts_scr_name,
&kim_gdata->kim_pdev->dev);
if (unlikely((err != 0) || (kim_gdata->fw_entry->data == NULL) ||
@@ -1218,7 +1206,7 @@
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
-@@ -3700,16 +3700,13 @@ static int bnx2_request_uncached_firmwar
+@@ -3701,16 +3701,13 @@ static int bnx2_request_uncached_firmwar
}
rc = request_firmware(&bp->mips_firmware, mips_fw_file, &bp->pdev->dev);
@@ -1240,7 +1228,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
+@@ -12747,11 +12747,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 +1243,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
+@@ -11305,11 +11305,8 @@ static int tg3_request_firmware(struct t
{
const struct tg3_firmware_hdr *fw_hdr;
@@ -1338,7 +1326,7 @@
netif_info(nic, probe, nic->netdev,
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
-@@ -600,8 +600,6 @@ static int myri10ge_load_hotplug_firmwar
+@@ -601,8 +601,6 @@ static int myri10ge_load_hotplug_firmwar
unsigned i;
if ((status = request_firmware(&fw, mgp->fw_name, dev)) < 0) {
@@ -1431,7 +1419,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 +1452,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 +1478,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
+@@ -2185,19 +2185,8 @@ int b43_do_request_fw(struct b43_request
}
err = request_firmware(&ctx->blob, ctx->fwname,
ctx->dev->dev->dev);
@@ -1552,7 +1540,7 @@
}
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -8425,12 +8425,8 @@ static int ipw2100_get_firmware(struct i
+@@ -8419,12 +8419,8 @@ static int ipw2100_get_firmware(struct i
rc = request_firmware(&fw->fw_entry, fw_name, &priv->pci_dev->dev);
@@ -1592,7 +1580,7 @@
else
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
-@@ -979,13 +979,8 @@ static void iwl_req_fw_callback(const st
+@@ -990,13 +990,8 @@ static void iwl_req_fw_callback(const st
memset(&pieces, 0, sizeof(pieces));
@@ -1620,7 +1608,7 @@
}
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
-@@ -421,11 +421,8 @@ static void mwifiex_fw_dpc(const struct
+@@ -427,11 +427,8 @@ static void mwifiex_fw_dpc(const struct
bool init_failed = false;
struct wireless_dev *wdev;
@@ -1635,7 +1623,7 @@
adapter->firmware = firmware;
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
-@@ -5715,16 +5715,12 @@ static int mwl8k_firmware_load_success(s
+@@ -5708,16 +5708,12 @@ static int mwl8k_firmware_load_success(s
static void mwl8k_fw_state_machine(const struct firmware *fw, void *context)
{
struct mwl8k_priv *priv = context;
@@ -1653,7 +1641,7 @@
priv->fw_helper = fw;
rc = mwl8k_request_fw(priv, priv->fw_pref, &priv->fw_ucode,
true);
-@@ -5759,11 +5755,8 @@ static void mwl8k_fw_state_machine(const
+@@ -5752,11 +5748,8 @@ static void mwl8k_fw_state_machine(const
break;
case FW_STATE_LOADING_ALT:
@@ -1666,7 +1654,7 @@
priv->fw_ucode = fw;
rc = mwl8k_firmware_load_success(priv);
if (rc)
-@@ -5801,10 +5794,8 @@ retry:
+@@ -5794,10 +5787,8 @@ retry:
/* Ask userland hotplug daemon for the device firmware */
rc = mwl8k_request_firmware(priv, fw_image, nowait);
@@ -1714,7 +1702,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
+@@ -1675,7 +1675,6 @@ static int ezusb_probe(struct usb_interf
if (ezusb_firmware_download(upriv, &firmware) < 0)
goto error;
} else {
@@ -1835,7 +1823,7 @@
wl1251_error("nvs size is not multiple of 32 bits: %zu",
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
-@@ -748,10 +748,8 @@ static int wl12xx_fetch_firmware(struct
+@@ -749,10 +749,8 @@ static int wl12xx_fetch_firmware(struct
ret = request_firmware(&fw, fw_name, wl->dev);
@@ -1944,7 +1932,7 @@
if (err) {
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
-@@ -1778,7 +1778,6 @@ bfad_read_firmware(struct pci_dev *pdev,
+@@ -1766,7 +1766,6 @@ bfad_read_firmware(struct pci_dev *pdev,
const struct firmware *fw;
if (request_firmware(&fw, fw_name, &pdev->dev)) {
@@ -1968,15 +1956,16 @@
--- 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
+@@ -687,10 +687,6 @@ static ssize_t pm8001_store_update_fw(st
pm8001_ha->dev);
- if (err) {
+ if (ret) {
- PM8001_FAIL_DBG(pm8001_ha,
-- pm8001_printk("Failed to load firmware image file %s,"
-- " error %d\n", filename_ptr, err));
- err = FAIL_OPEN_BIOS_FILE;
- goto out1;
+- pm8001_printk(
+- "Failed to load firmware image file %s, error %d\n",
+- filename_ptr, ret));
+ pm8001_ha->fw_status = FAIL_OPEN_BIOS_FILE;
+ goto out;
}
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1991,7 +1980,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,
+@@ -5350,8 +5350,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
@@ -2000,7 +1989,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 *
+@@ -5453,8 +5451,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
@@ -2011,7 +2000,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 +2015,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
+@@ -5413,8 +5413,6 @@ qla2x00_request_firmware(scsi_qla_host_t
goto out;
if (request_firmware(&blob->fw, blob->name, &ha->pdev->dev)) {
@@ -2052,7 +2041,7 @@
fw->size, fwname);
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
-@@ -2233,16 +2233,12 @@ struct net_device *init_ft1000_card(stru
+@@ -2230,16 +2230,12 @@ struct net_device *init_ft1000_card(stru
info->AsicID = ft1000_read_reg(dev, FT1000_REG_ASIC_ID);
if (info->AsicID == ELECTRABUZZ_ID) {
DEBUG(0, "ft1000_hw: ELECTRABUZZ ASIC\n");
@@ -2113,9 +2102,9 @@
/* initiate firmware upload */
errno = as102_firmware_upload(bus_adap, cmd_buf, firmware);
---- a/drivers/staging/media/go7007/go7007-driver.c
-+++ b/drivers/staging/media/go7007/go7007-driver.c
-@@ -95,10 +95,8 @@ static int go7007_load_encoder(struct go
+--- a/drivers/media/usb/go7007/go7007-driver.c
++++ b/drivers/media/usb/go7007/go7007-driver.c
+@@ -92,10 +92,8 @@ static int go7007_load_encoder(struct go
u16 intr_val, intr_data;
if (go->boot_fw == NULL) {
@@ -2127,8 +2116,8 @@
if (fw_entry->size < 16 || memcmp(fw_entry->data, "WISGO7007FW", 11)) {
v4l2_err(go, "file \"%s\" does not appear to be go7007 firmware\n", fw_name);
release_firmware(fw_entry);
---- a/drivers/staging/media/go7007/go7007-fw.c
-+++ b/drivers/staging/media/go7007/go7007-fw.c
+--- a/drivers/media/usb/go7007/go7007-fw.c
++++ b/drivers/media/usb/go7007/go7007-fw.c
@@ -1570,12 +1570,8 @@ int go7007_construct_fw_image(struct go7
default:
return -1;
@@ -2143,9 +2132,9 @@
code = kzalloc(codespace * 2, GFP_KERNEL);
if (code == NULL)
goto fw_failed;
---- a/drivers/staging/media/go7007/go7007-loader.c
-+++ b/drivers/staging/media/go7007/go7007-loader.c
-@@ -79,11 +79,8 @@ static int go7007_loader_probe(struct us
+--- a/drivers/media/usb/go7007/go7007-loader.c
++++ b/drivers/media/usb/go7007/go7007-loader.c
+@@ -75,11 +75,8 @@ static int go7007_loader_probe(struct us
dev_info(&interface->dev, "loading firmware %s\n", fw1);
@@ -2158,7 +2147,7 @@
ret = cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
release_firmware(fw);
if (0 != ret) {
-@@ -94,11 +91,8 @@ static int go7007_loader_probe(struct us
+@@ -90,11 +87,8 @@ static int go7007_loader_probe(struct us
if (fw2 == NULL)
return 0;
@@ -2203,12 +2192,12 @@
struct usb_device *udev = padapter->dvobjpriv.pusbdev;
struct usb_interface *pusb_intf = padapter->pusb_intf;
- dev_err(&udev->dev, "r8712u: Firmware request failed\n");
- padapter->fw_found = false;
usb_put_dev(udev);
usb_set_intfdata(pusb_intf, NULL);
+ return;
--- 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 +2210,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,8 +2225,8 @@
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
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Download firmware\n");
+@@ -53,11 +53,8 @@ int vnt_download_firmware(struct vnt_pri
+ dev_dbg(dev, "---->Download firmware\n");
rc = request_firmware(&fw, FIRMWARE_NAME, dev);
- if (rc) {
@@ -2248,8 +2237,8 @@
+ if (rc)
+ goto out;
- pBuffer = kmalloc(FIRMWARE_CHUNK_SIZE, GFP_KERNEL);
- if (!pBuffer)
+ buffer = kmalloc(FIRMWARE_CHUNK_SIZE, GFP_KERNEL);
+ if (!buffer)
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -3522,10 +3522,8 @@ static int cyz_load_fw(struct pci_dev *p
@@ -2309,7 +2298,7 @@
}
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
-@@ -1178,10 +1178,8 @@ static void uart_firmware_cont(const str
+@@ -1167,10 +1167,8 @@ static void uart_firmware_cont(const str
struct device *dev = context;
int ret;
@@ -2657,7 +2646,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
+@@ -1644,10 +1644,8 @@ static void azx_firmware_cb(const struct
struct azx *chip = card->private_data;
struct pci_dev *pci = chip->pci;
@@ -2742,7 +2731,7 @@
"too short firmware size %d (expected %d)\n",
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
-@@ -891,10 +891,8 @@ static int wm2000_i2c_probe(struct i2c_c
+@@ -889,10 +889,8 @@ static int wm2000_i2c_probe(struct i2c_c
}
ret = request_firmware(&fw, filename, &i2c->dev);
Modified: dists/trunk/linux/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch Sat Sep 13 06:23:27 2014 (r21840)
@@ -20,7 +20,7 @@
---
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
-@@ -344,17 +344,20 @@ static int fw_get_filesystem_firmware(st
+@@ -340,17 +340,20 @@ static int fw_get_filesystem_firmware(st
}
rc = fw_read_file_contents(file, buf);
fput(file);
@@ -46,7 +46,7 @@
mutex_lock(&fw_lock);
set_bit(FW_STATUS_DONE, &buf->status);
complete_all(&buf->completion);
-@@ -1007,7 +1010,8 @@ _request_firmware_prepare(struct firmwar
+@@ -1026,7 +1029,8 @@ _request_firmware_prepare(struct firmwar
}
if (fw_get_builtin_firmware(firmware, name)) {
@@ -56,7 +56,7 @@
return 0; /* assigned */
}
-@@ -1090,7 +1094,7 @@ _request_firmware(const struct firmware
+@@ -1109,7 +1113,7 @@ _request_firmware(const struct firmware
if (opt_flags & FW_OPT_NOWAIT) {
timeout = usermodehelper_read_lock_wait(timeout);
if (!timeout) {
Modified: dists/trunk/linux/debian/patches/bugfix/all/firmware_class-return-specific-errors-from-file-read.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/firmware_class-return-specific-errors-from-file-read.patch Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware_class-return-specific-errors-from-file-read.patch Sat Sep 13 06:23:27 2014 (r21840)
@@ -17,46 +17,25 @@
---
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
-@@ -283,12 +283,15 @@ MODULE_PARM_DESC(path, "customized firmw
- static noinline_for_stack int fw_file_size(struct file *file)
- {
- struct kstat st;
-- if (vfs_getattr(&file->f_path, &st))
-- return -1;
-+ int ret;
-+
-+ ret = vfs_getattr(&file->f_path, &st);
-+ if (ret)
-+ return ret;
- if (!S_ISREG(st.mode))
-- return -1;
-+ return -ENOTTY;
- if (st.size != (int)st.size)
-- return -1;
-+ return -EFBIG;
- return st.size;
- }
-
-@@ -299,14 +302,16 @@ static int fw_read_file_contents(struct
+@@ -293,7 +293,7 @@ static int fw_read_file_contents(struct
int rc;
- size = fw_file_size(file);
-- if (size <= 0)
-+ if (size < 0)
-+ return size;
-+ if (size == 0)
+ if (!S_ISREG(file_inode(file)->i_mode))
+- return -EINVAL;
++ return -ENOTTY;
+ size = i_size_read(file_inode(file));
+ if (size <= 0)
return -EINVAL;
- buf = vmalloc(size);
- if (!buf)
+@@ -302,7 +302,7 @@ static int fw_read_file_contents(struct
return -ENOMEM;
rc = kernel_read(file, 0, buf, size);
if (rc != size) {
- if (rc > 0)
+ if (rc >= 0)
rc = -EIO;
- vfree(buf);
- return rc;
-@@ -333,8 +338,10 @@ static int fw_get_filesystem_firmware(st
+ goto fail;
+ }
+@@ -334,8 +334,10 @@ static int fw_get_filesystem_firmware(st
snprintf(path, PATH_MAX, "%s/%s", fw_path[i], buf->fw_id);
file = filp_open(path, O_RDONLY, 0);
@@ -68,7 +47,7 @@
rc = fw_read_file_contents(file, buf);
fput(file);
if (rc)
-@@ -950,13 +957,6 @@ static void kill_requests_without_uevent
+@@ -974,13 +976,6 @@ static void kill_requests_without_uevent
#endif
#else /* CONFIG_FW_LOADER_USER_HELPER */
@@ -82,15 +61,15 @@
/* No abort during direct loading */
#define is_fw_load_aborted(buf) false
-@@ -1105,6 +1105,7 @@ _request_firmware(const struct firmware
+@@ -1129,6 +1124,7 @@ _request_firmware(const struct firmware
}
ret = fw_get_filesystem_firmware(device, fw->priv);
+#ifdef CONFIG_FW_LOADER_USER_HELPER
if (ret) {
- if (opt_flags & FW_OPT_FALLBACK) {
+ if (!(opt_flags & FW_OPT_NO_WARN))
dev_warn(device,
-@@ -1115,6 +1116,7 @@ _request_firmware(const struct firmware
+@@ -1140,6 +1136,7 @@ _request_firmware(const struct firmware
opt_flags, timeout);
}
}
Modified: dists/trunk/linux/debian/patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch Sat Sep 13 06:23:27 2014 (r21840)
@@ -15,7 +15,7 @@
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
-@@ -110,12 +110,12 @@ as-instr = $(call try-run,\
+@@ -111,12 +111,12 @@ as-instr = $(call try-run,\
# Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
cc-option = $(call try-run,\
@@ -30,7 +30,7 @@
# cc-option-align
# Prefix align with either -falign or -malign
-@@ -125,16 +125,17 @@ cc-option-align = $(subst -functions=0,,
+@@ -126,16 +126,17 @@ cc-option-align = $(subst -functions=0,,
# cc-disable-warning
# Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
cc-disable-warning = $(call try-run,\
@@ -51,7 +51,7 @@
# cc-ifversion
# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
-@@ -148,7 +149,7 @@ cc-ldoption = $(call try-run,\
+@@ -149,7 +150,7 @@ cc-ldoption = $(call try-run,\
# ld-option
# Usage: LDFLAGS += $(call ld-option, -X)
ld-option = $(call try-run,\
@@ -62,16 +62,16 @@
# Usage: KBUILD_ARFLAGS := $(call ar-option,D)
--- a/Makefile
+++ b/Makefile
-@@ -578,6 +578,8 @@ else
+@@ -624,6 +624,8 @@ else
KBUILD_CFLAGS += -O2
endif
+NOSTDINC_FLAGS += -nostdinc
+
- ifdef CONFIG_READABLE_ASM
- # Disable optimizations that make assembler listings hard to read.
- # reorder blocks reorders the control in the function
-@@ -646,7 +648,7 @@ KBUILD_CFLAGS += $(call cc-option, -fno-
+ # Tell gcc to never replace conditional load with a non-conditional one
+ KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
+
+@@ -750,7 +752,7 @@ KBUILD_CFLAGS += $(call cc-option, -fno-
endif
# arch Makefile may override CC so keep this after arch Makefile is included
Modified: dists/trunk/linux/debian/patches/bugfix/mips/disable-advansys.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/mips/disable-advansys.patch Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/bugfix/mips/disable-advansys.patch Sat Sep 13 06:23:27 2014 (r21840)
@@ -12,13 +12,16 @@
But report:
http://www.mail-archive.com/linux-scsi@vger.kernel.org/msg12773.html
---- a/drivers/scsi/Kconfig 2007-12-27 19:16:18.000000000 +0000
-+++ b/drivers/scsi/Kconfig 2007-12-27 19:16:58.000000000 +0000
-@@ -523,6 +523,7 @@
+[bwh: Upstream finally accepted this was broken on ARM! But MIPS has
+ the same problem still.]
+
+--- a/drivers/scsi/Kconfig
++++ b/drivers/scsi/Kconfig
+@@ -495,6 +495,7 @@ config SCSI_ADVANSYS
tristate "AdvanSys SCSI support"
- depends on SCSI && VIRT_TO_BUS
+ depends on SCSI && VIRT_TO_BUS && !ARM
depends on ISA || EISA || PCI
-+ depends on (!MIPS && !ARM) || BROKEN
++ depends on !MIPS || BROKEN
help
This is a driver for all SCSI host adapters manufactured by
AdvanSys. It is documented in the kernel source in
Modified: dists/trunk/linux/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux/debian/patches/debian/dfsg/files-1 Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/debian/dfsg/files-1 Sat Sep 13 06:23:27 2014 (r21840)
@@ -18,11 +18,6 @@
rm drivers/staging/ft1000/ft1000-pcmcia/boot.h
rm drivers/staging/ft1000/ft1000-*/*.img
-rm drivers/staging/keucr/init.h
-
-rm drivers/staging/wlags49_h2/ap_*.c
-rm drivers/staging/wlags49_h2/sta_*.c
-
# These include apparently obfuscated code
rm drivers/video/fbdev/nvidia/
rm drivers/video/fbdev/riva/
Modified: dists/trunk/linux/debian/patches/debian/ia64-hardcode-arch-script-output.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/ia64-hardcode-arch-script-output.patch Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/debian/ia64-hardcode-arch-script-output.patch Sat Sep 13 06:23:27 2014 (r21840)
@@ -21,11 +21,9 @@
altogether, and allow for the possibility of other archs to provide
their own scripts in the future.
-diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
-index e7cbaa0..c8af869 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
-@@ -30,16 +30,7 @@ cflags-y := -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \
+@@ -30,16 +30,7 @@ cflags-y := -pipe $(EXTRA) -ffixed-r13 -
-falign-functions=32 -frename-registers -fno-optimize-sibling-calls
KBUILD_CFLAGS_KERNEL := -mconstant-gp
@@ -43,7 +41,7 @@
KBUILD_CFLAGS += $(cflags-y)
head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o
-@@ -69,7 +60,7 @@ boot := arch/ia64/hp/sim/boot
+@@ -66,7 +57,7 @@ boot := arch/ia64/hp/sim/boot
PHONY += boot compressed check
@@ -52,17 +50,17 @@
compressed: vmlinux.gz
-@@ -78,9 +69,6 @@ vmlinuz: vmlinux.gz
+@@ -75,9 +66,6 @@ vmlinuz: vmlinux.gz
vmlinux.gz: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $@
-unwcheck: vmlinux
-- -$(Q)READELF=$(READELF) python $(srctree)/arch/ia64/scripts/unwcheck.py $<
+- -$(Q)READELF=$(READELF) $(PYTHON) $(srctree)/arch/ia64/scripts/unwcheck.py $<
-
archclean:
$(Q)$(MAKE) $(clean)=$(boot)
-@@ -96,7 +84,6 @@ define archhelp
+@@ -93,7 +81,6 @@ define archhelp
echo '* compressed - Build compressed kernel image'
echo ' install - Install compressed kernel image'
echo ' boot - Build vmlinux and bootloader for Ski simulator'
Modified: dists/trunk/linux/debian/patches/debian/version.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/version.patch Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/debian/version.patch Sat Sep 13 06:23:27 2014 (r21840)
@@ -9,7 +9,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -826,7 +826,7 @@ endif
+@@ -963,7 +963,7 @@ endif
prepare2: prepare3 outputmakefile asm-generic
prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
@@ -18,7 +18,7 @@
$(cmd_crmodverdir)
archprepare: archheaders archscripts prepare1 scripts_basic
-@@ -858,12 +858,25 @@ define filechk_version.h
+@@ -995,12 +995,25 @@ define filechk_version.h
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
endef
@@ -54,7 +54,7 @@
#include <asm/current.h>
#include <asm/ptrace.h>
#include <asm/sysrq.h>
-@@ -16,8 +17,9 @@ void __show_regs(struct pt_regs *regs)
+@@ -16,8 +17,9 @@ void show_regs(struct pt_regs *regs)
{
printk("\n");
print_modules();
@@ -90,7 +90,7 @@
regs->ar_unat, regs->ar_pfs, regs->ar_rsc);
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
-@@ -38,6 +38,7 @@
+@@ -37,6 +37,7 @@
#include <linux/personality.h>
#include <linux/random.h>
#include <linux/hw_breakpoint.h>
@@ -98,7 +98,7 @@
#include <asm/pgtable.h>
#include <asm/uaccess.h>
-@@ -843,8 +844,9 @@ void show_regs(struct pt_regs * regs)
+@@ -1004,8 +1005,9 @@ void show_regs(struct pt_regs * regs)
printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
regs->nip, regs->link, regs->ctr);
@@ -112,15 +112,15 @@
printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer);
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
-@@ -45,6 +45,7 @@
- #include <linux/poll.h>
+@@ -46,6 +46,7 @@
#include <linux/irq_work.h>
#include <linux/utsname.h>
+ #include <linux/ctype.h>
+#include <generated/package.h>
#include <asm/uaccess.h>
-@@ -2871,11 +2872,12 @@ void __init dump_stack_set_arch_desc(con
+@@ -3034,11 +3035,12 @@ void __init dump_stack_set_arch_desc(con
*/
void dump_stack_print_info(const char *log_lvl)
{
Modified: dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch Sat Sep 13 06:23:27 2014 (r21840)
@@ -19,7 +19,7 @@
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -569,8 +569,8 @@ bytes respectively. Such letter suffixes
+@@ -580,8 +580,8 @@ bytes respectively. Such letter suffixes
ccw_timeout_log [S390]
See Documentation/s390/CommonIO for details.
@@ -32,7 +32,7 @@
a single hierarchy
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -960,6 +960,14 @@ config MEMCG
+@@ -1003,6 +1003,14 @@ config MEMCG
disable memory resource controller and you can avoid overheads.
(and lose benefits of memory resource controller)
@@ -49,7 +49,7 @@
depends on MEMCG && SWAP
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -5182,7 +5182,7 @@ static void cgroup_release_agent(struct
+@@ -5359,7 +5359,7 @@ static void cgroup_release_agent(struct
mutex_unlock(&cgroup_mutex);
}
@@ -58,7 +58,7 @@
{
struct cgroup_subsys *ss;
char *token;
-@@ -5194,17 +5194,29 @@ static int __init cgroup_disable(char *s
+@@ -5371,17 +5371,29 @@ static int __init cgroup_disable(char *s
for_each_subsys(ss, i) {
if (!strcmp(token, ss->name)) {
@@ -88,12 +88,12 @@
+}
+__setup("cgroup_enable=", cgroup_enable);
+
- /**
- * css_tryget_online_from_dir - get corresponding css from a cgroup dentry
- * @dentry: directory dentry of interest
+ static int __init cgroup_set_legacy_files_on_dfl(char *str)
+ {
+ printk("cgroup: using legacy files on the default hierarchy\n");
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
-@@ -7015,6 +7015,9 @@ static void mem_cgroup_bind(struct cgrou
+@@ -6297,6 +6297,9 @@ static void mem_cgroup_bind(struct cgrou
}
struct cgroup_subsys memory_cgrp_subsys = {
Modified: dists/trunk/linux/debian/patches/features/all/efi-autoload-efivars.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/all/efi-autoload-efivars.patch Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/features/all/efi-autoload-efivars.patch Sat Sep 13 06:23:27 2014 (r21840)
@@ -14,48 +14,8 @@
register a corresponding platform device whenever EFI runtime services
are available. This should trigger udev to load them.
+[bwh: Most of this went upstream in 3.17-rc4, just not the efi-pstore bit.]
---
---- a/arch/x86/platform/efi/efi.c
-+++ b/arch/x86/platform/efi/efi.c
-@@ -42,6 +42,7 @@
- #include <linux/io.h>
- #include <linux/reboot.h>
- #include <linux/bcd.h>
-+#include <linux/platform_device.h>
-
- #include <asm/setup.h>
- #include <asm/efi.h>
-@@ -783,6 +784,20 @@ void __init efi_late_init(void)
- efi_bgrt_init();
- }
-
-+#ifdef CONFIG_EFI_VARS_MODULE
-+static int __init efi_load_efivars(void)
-+{
-+ struct platform_device *pdev;
-+
-+ if (!efi_enabled(EFI_RUNTIME_SERVICES))
-+ return 0;
-+
-+ pdev = platform_device_register_simple("efivars", 0, NULL, 0);
-+ return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;
-+}
-+device_initcall(efi_load_efivars);
-+#endif
-+
- void __init efi_set_executable(efi_memory_desc_t *md, bool executable)
- {
- u64 addr, npages;
---- a/drivers/firmware/efi/efivars.c
-+++ b/drivers/firmware/efi/efivars.c
-@@ -77,6 +77,7 @@ MODULE_AUTHOR("Matt Domsch <Matt_Domsch@
- MODULE_DESCRIPTION("sysfs interface to EFI Variables");
- MODULE_LICENSE("GPL");
- MODULE_VERSION(EFIVARS_VERSION);
-+MODULE_ALIAS("platform:efivars");
-
- LIST_HEAD(efivar_sysfs_list);
- EXPORT_SYMBOL_GPL(efivar_sysfs_list);
--- a/drivers/firmware/efi/efi-pstore.c
+++ b/drivers/firmware/efi/efi-pstore.c
@@ -250,3 +250,4 @@ module_exit(efivars_pstore_exit);
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/series Sat Sep 13 06:23:27 2014 (r21840)
@@ -18,13 +18,13 @@
# Patches and source files from aufs3 repository, imported with
# debian/patches/features/all/aufs3/gen-patch.
-features/all/aufs3/aufs3-kbuild.patch
-features/all/aufs3/aufs3-base.patch
-features/all/aufs3/aufs3-mmap.patch
-features/all/aufs3/aufs3-standalone.patch
-features/all/aufs3/aufs3-add.patch
+#features/all/aufs3/aufs3-kbuild.patch
+#features/all/aufs3/aufs3-base.patch
+#features/all/aufs3/aufs3-mmap.patch
+#features/all/aufs3/aufs3-standalone.patch
+#features/all/aufs3/aufs3-add.patch
# Debian-specific changes
-debian/aufs3-mark-as-staging.patch
+#debian/aufs3-mark-as-staging.patch
# Change some defaults for security reasons
debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
@@ -52,75 +52,23 @@
bugfix/arm/ixp4xx_iobe.patch
bugfix/m68k/ethernat-kconfig.patch
bugfix/mips/MIPS-ZBOOT-add-missing-linux-string.h-include.patch
-bugfix/mips/MIPS-OCTEON-make-get_system_type-thread-safe.patch
-bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch
-bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch
-bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch
-bugfix/mips/MIPS-Remove-BUG_ON-is_fpu_owner-in-do_ade.patch
bugfix/x86/x86-reject-x32-executables-if-x32-abi-not-supported.patch
-bugfix/s390/s390-3215-fix-hanging-console-issue.patch
# Arch features
-features/mips/MIPS-Support-hard-limit-of-cpu-count-nr_cpu_ids.patch
-features/mips/MIPS-Support-CPU-topology-files-in-sysfs.patch
-features/mips/MIPS-Loongson-Modify-ChipConfig-register-definition.patch
-features/mips/MIPS-Add-NUMA-support-for-Loongson-3.patch
-features/mips/MIPS-Add-numa-api-support.patch
-features/mips/MIPS-Add-Loongson-3B-support.patch
-features/mips/MIPS-Loongson-3-Enable-the-COP2-usage.patch
-features/mips/MIPS-Loongson-Rename-CONFIG_LEMOTE_MACH3A-to-CONFIG_.patch
features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
-features/powerpc/KVM-prepare-for-KVM_-S-G-ET_MP_STATE-on-other-archit.patch
-features/powerpc/KVM-PPC-Book3s-PR-Disable-AIL-mode-with-OPAL.patch
-features/powerpc/KVM-PPC-Book3s-HV-Fix-tlbie-compile-error.patch
-features/powerpc/KVM-PPC-Book3S-PR-Handle-hyp-doorbell-exits.patch
-features/powerpc/KVM-PPC-Book3S-HV-Fix-ABIv2-indirect-branch-issue.patch
-features/powerpc/KVM-PPC-Book3S-PR-Fix-sparse-endian-checks.patch
-features/powerpc/KVM-PPC-Book3S-Controls-for-in-kernel-sPAPR-hypercal.patch
-features/powerpc/PPC-Add-asm-helpers-for-BE-32bit-load-store.patch
-features/powerpc/KVM-PPC-Book3S-HV-Make-HTAB-code-LE-host-aware.patch
-features/powerpc/KVM-PPC-Book3S-HV-Access-guest-VPA-in-BE.patch
-features/powerpc/KVM-PPC-Book3S-HV-Access-host-lppaca-and-shadow-slb-.patch
-features/powerpc/KVM-PPC-Book3S-HV-Access-XICS-in-BE.patch
-features/powerpc/KVM-PPC-Book3S-HV-Fix-ABIv2-on-LE.patch
-features/powerpc/KVM-PPC-Book3S-HV-Enable-for-little-endian-hosts.patch
-features/powerpc/KVM-Rename-and-add-argument-to-check_extension.patch
-features/powerpc/KVM-Allow-KVM_CHECK_EXTENSION-on-the-vm-fd.patch
-features/powerpc/KVM-Don-t-keep-reference-to-irq-routing-table-in-irq.patch
-features/powerpc/KVM-irqchip-Provide-and-use-accessors-for-irq-routin.patch
-features/powerpc/KVM-Move-all-accesses-to-kvm-irq_routing-into-irqchi.patch
-features/powerpc/KVM-Move-irq-notifier-implementation-into-eventfd.c.patch
-features/powerpc/KVM-Give-IRQFD-its-own-separate-enabling-Kconfig-opt.patch
-features/powerpc/KVM-PPC-Enable-IRQFD-support-for-the-XICS-interrupt-.patch
features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.patch
features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
features/x86/x86-make-x32-syscall-support-conditional.patch
features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
-features/arm64/drivers-net-Add-APM-X-Gene-SoC-ethernet-driver-suppo.patch
features/arm64/drivers-net-NET_XGENE-should-depend-on-HAS_DMA.patch
-features/arm64/net-xgene-Check-negative-return-value-of-xgene_enet_.patch
-features/arm64/net-xgene-fix-possible-NULL-dereference-in-xgene_ene.patch
-features/arm64/dts-Add-bindings-for-APM-X-Gene-SoC-ethernet-driver.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
-bugfix/all/aio-fix-reqs_available-handling.patch
-bugfix/all/mnt-Only-change-user-settable-mount-flags-in-remount.patch
-bugfix/all/mnt-Move-the-test-for-MNT_LOCK_READONLY-from-change_.patch
-bugfix/all/mnt-Correct-permission-checks-in-do_remount.patch
-bugfix/all/mnt-Change-the-default-remount-atime-from-relatime-t.patch
-bugfix/all/mnt-Add-tests-for-unprivileged-remount-cases-that-ha.patch
debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch
bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch
-bugfix/all/libceph-set-last_piece-in-ceph_msg_data_pages_cursor.patch
-bugfix/all/libceph-gracefully-handle-large-reply-messages-from-.patch
-bugfix/all/libceph-add-process_one_ticket-helper.patch
-bugfix/all/libceph-do-not-hard-code-max-auth-ticket-len.patch
# Miscellaneous features
features/all/efi-autoload-efivars.patch
-features/all/virtio-scsi-Implement-change_queue_depth-for-virtscs.patch
-debian/revert-staging-sm7xxfb-remove-driver.patch
Modified: dists/trunk/linux/debian/patches/series-orig
==============================================================================
--- dists/trunk/linux/debian/patches/series-orig Sat Sep 13 05:42:09 2014 (r21839)
+++ dists/trunk/linux/debian/patches/series-orig Sat Sep 13 06:23:27 2014 (r21840)
@@ -2,8 +2,6 @@
+ debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
+ debian/dfsg/vs6624-disable.patch
+ debian/dfsg/drivers-net-appletalk-cops.patch
-+ debian/dfsg/drivers-staging-wlags49_h2-disable.patch
-+ debian/dfsg/drivers-staging-wlags49_h25-disable.patch
+ debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
+ debian/dfsg/firmware-cleanup.patch
X debian/dfsg/files-1
More information about the Kernel-svn-changes
mailing list