[kernel] r22149 - in dists/trunk/linux/debian: . patches patches/bugfix/all patches/bugfix/parisc patches/bugfix/x86 patches/features/all patches/features/arm patches/features/arm64 patches/features/powerpc patches/features/x86
Ben Hutchings
benh at moszumanska.debian.org
Tue Dec 9 03:06:08 UTC 2014
Author: benh
Date: Tue Dec 9 03:06:08 2014
New Revision: 22149
Log:
Update to 3.18
Drop/refresh patches as necessary.
Disable aufs.
Deleted:
dists/trunk/linux/debian/patches/bugfix/all/drivers-net-Disable-UFO-through-virtio.patch
dists/trunk/linux/debian/patches/bugfix/all/of-fdt-memblock_reserve-memreserve-regions-in-the-ca.patch
dists/trunk/linux/debian/patches/bugfix/all/xen-netback-fix-unlimited-guest-Rx-internal-queue-an.patch
dists/trunk/linux/debian/patches/bugfix/all/xen-netback-make-feature-rx-notify-mandatory.patch
dists/trunk/linux/debian/patches/bugfix/all/xen-netback-reintroduce-guest-Rx-stall-detection.patch
dists/trunk/linux/debian/patches/bugfix/parisc/parisc-reduce-sigrtmin-from-37-to-32-to-behave-like-.patch
dists/trunk/linux/debian/patches/bugfix/x86/x86_64-traps-Fix-the-espfix64-DF-fixup-and-rewrite-i.patch
dists/trunk/linux/debian/patches/bugfix/x86/x86_64-traps-Rework-bad_iret.patch
dists/trunk/linux/debian/patches/bugfix/x86/x86_64-traps-Stop-using-IST-for-SS.patch
dists/trunk/linux/debian/patches/features/arm/dts-sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME.patch
dists/trunk/linux/debian/patches/features/arm64/drivers-net-xgene-Add-10GbE-ethtool-support.patch
dists/trunk/linux/debian/patches/features/arm64/drivers-net-xgene-Add-10GbE-support.patch
dists/trunk/linux/debian/patches/features/arm64/drivers-net-xgene-Add-SGMII-based-1GbE-ethtool-suppo.patch
dists/trunk/linux/debian/patches/features/arm64/drivers-net-xgene-Add-SGMII-based-1GbE-support.patch
dists/trunk/linux/debian/patches/features/arm64/drivers-net-xgene-Backward-compatibility-with-older-.patch
dists/trunk/linux/debian/patches/features/arm64/drivers-net-xgene-Preparing-for-adding-10GbE-support.patch
dists/trunk/linux/debian/patches/features/arm64/drivers-net-xgene-Preparing-for-adding-SGMII-based-1.patch
dists/trunk/linux/debian/patches/features/arm64/drivers-net-xgene-Rewrite-buggy-loop-in-xgene_enet_e.patch
dists/trunk/linux/debian/patches/features/arm64/drivers-net-xgene-fix-Use-separate-resources.patch
dists/trunk/linux/debian/patches/features/arm64/dtb-Add-10GbE-node-to-APM-X-Gene-SoC-device-tree.patch
dists/trunk/linux/debian/patches/features/arm64/dtb-Add-SGMII-based-1GbE-node-to-APM-X-Gene-SoC-devi.patch
dists/trunk/linux/debian/patches/features/arm64/dtb-xgene-fix-Backward-compatibility-with-older-firm.patch
dists/trunk/linux/debian/patches/features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.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/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
dists/trunk/linux/debian/patches/features/arm/dts-sun7i-Add-Banana-Pi-board.patch
dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
dists/trunk/linux/debian/patches/series
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Tue Dec 9 02:55:16 2014 (r22148)
+++ dists/trunk/linux/debian/changelog Tue Dec 9 03:06:08 2014 (r22149)
@@ -1,3 +1,9 @@
+linux (3.18-1~exp1) UNRELEASED; urgency=medium
+
+ * New upstream release: http://kernelnewbies.org/Linux_3.18
+
+ -- Ben Hutchings <ben at decadent.org.uk> Tue, 09 Dec 2014 02:08:47 +0000
+
linux (3.17.4-1~exp1) experimental; urgency=medium
* New upstream stable update:
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 Tue Dec 9 02:55:16 2014 (r22148)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Tue Dec 9 03:06:08 2014 (r22149)
@@ -96,7 +96,7 @@
fw_size = firmware->size / sizeof(u32);
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
-@@ -375,10 +375,8 @@ static int ath3k_load_patch(struct usb_d
+@@ -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);
@@ -108,7 +108,7 @@
pt_rom_version = get_unaligned_le32(firmware->data +
firmware->size - 8);
-@@ -438,10 +436,8 @@ static int ath3k_load_syscfg(struct usb_
+@@ -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);
@@ -154,7 +154,7 @@
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
-@@ -570,10 +570,8 @@ static int bt3c_open(bt3c_info_t *info)
+@@ -571,10 +571,8 @@ static int bt3c_open(struct bt3c_info *i
/* Load firmware */
err = request_firmware(&firmware, "BT3CPCC.bin", &info->p_dev->dev);
@@ -168,7 +168,7 @@
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
-@@ -297,8 +297,6 @@ static int btmrvl_sdio_download_helper(s
+@@ -328,8 +328,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;
}
-@@ -397,8 +395,6 @@ static int btmrvl_sdio_download_fw_w_hel
+@@ -428,8 +426,6 @@ static int btmrvl_sdio_download_fw_w_hel
ret = request_firmware(&fw_firmware, card->firmware,
&card->func->dev);
if ((ret < 0) || !fw_firmware) {
@@ -274,7 +274,7 @@
release_firmware(rdev->me_fw);
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
-@@ -1012,10 +1012,7 @@ static int r100_cp_init_microcode(struct
+@@ -1029,10 +1029,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
-@@ -2426,10 +2426,6 @@ int r600_init_microcode(struct radeon_de
+@@ -2518,10 +2518,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
-@@ -1932,10 +1932,8 @@ static int mxt_load_fw(struct device *de
+@@ -1942,10 +1942,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
-@@ -2372,12 +2372,9 @@ static int stk9090m_frontend_attach(stru
+@@ -2394,12 +2394,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;
-@@ -2438,12 +2435,9 @@ static int nim9090md_frontend_attach(str
+@@ -2460,12 +2457,9 @@ static int nim9090md_frontend_attach(str
msleep(20);
dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);
@@ -498,7 +498,7 @@
+ if (ret)
return ret;
- }
- deb_info("got firmware: %zd\n",fw->size);
+ deb_info("got firmware: %zu\n", fw->size);
b = fw->data;
--- a/drivers/media/dvb-frontends/cx24116.c
@@ -534,7 +534,7 @@
if (state->microcode == NULL) {
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
-@@ -6282,10 +6282,6 @@ static void load_firmware_cb(const struc
+@@ -6283,10 +6283,6 @@ static void load_firmware_cb(const struc
dprintk(1, ": %s\n", fw ? "firmware loaded" : "firmware not loaded");
if (!fw) {
@@ -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
-@@ -1262,13 +1262,8 @@ static int ngene_load_firm(struct ngene
+@@ -1260,13 +1260,8 @@ static int ngene_load_firm(struct ngene
break;
}
@@ -716,7 +716,7 @@
if (size == 0)
size = fw->size;
if (size != fw->size) {
-@@ -1276,8 +1271,6 @@ static int ngene_load_firm(struct ngene
+@@ -1274,8 +1269,6 @@ static int ngene_load_firm(struct ngene
": Firmware %s has invalid size!", fw_name);
err = -1;
} else {
@@ -830,7 +830,7 @@
+ if (ret)
return ret;
- }
- fmdbg("Firmware(%s) length : %d bytes\n", fw_name, fw_entry->size);
+ fmdbg("Firmware(%s) length : %zu bytes\n", fw_name, fw_entry->size);
fw_data = (void *)fw_entry->data;
--- a/drivers/media/pci/bt8xx/bttv-cards.c
@@ -940,7 +940,7 @@
pr_err("ERROR: Firmware size mismatch (have %zd, expected %d)\n",
--- a/drivers/media/pci/cx23885/cx23885-417.c
+++ b/drivers/media/pci/cx23885/cx23885-417.c
-@@ -930,14 +930,8 @@ static int cx23885_load_firmware(struct
+@@ -931,14 +931,8 @@ static int cx23885_load_firmware(struct
retval = request_firmware(&firmware, CX23885_FIRM_IMAGE_NAME,
&dev->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
-@@ -1958,11 +1958,7 @@ void cx23885_card_setup(struct cx23885_d
+@@ -1980,11 +1980,7 @@ void cx23885_card_setup(struct cx23885_d
cinfo.rev, filename);
ret = request_firmware(&fw, filename, &dev->pci->dev);
@@ -1075,7 +1075,7 @@
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
-@@ -94,10 +94,8 @@ int s5p_mfc_load_firmware(struct s5p_mfc
+@@ -95,10 +95,8 @@ int s5p_mfc_load_firmware(struct s5p_mfc
}
}
@@ -1206,7 +1206,7 @@
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
-@@ -3701,16 +3701,13 @@ static int bnx2_request_uncached_firmwar
+@@ -3702,16 +3702,13 @@ static int bnx2_request_uncached_firmwar
}
rc = request_firmware(&bp->mips_firmware, mips_fw_file, &bp->pdev->dev);
@@ -1228,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
-@@ -12747,11 +12747,8 @@ static int bnx2x_init_firmware(struct bn
+@@ -12953,11 +12953,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);
@@ -1243,7 +1243,7 @@
if (rc) {
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -11305,11 +11305,8 @@ static int tg3_request_firmware(struct t
+@@ -11325,11 +11325,8 @@ static int tg3_request_firmware(struct t
{
const struct tg3_firmware_hdr *fw_hdr;
@@ -1478,7 +1478,7 @@
int success = 0;
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -2185,19 +2185,8 @@ int b43_do_request_fw(struct b43_request
+@@ -2215,19 +2215,8 @@ int b43_do_request_fw(struct b43_request
}
err = request_firmware(&ctx->blob, ctx->fwname,
ctx->dev->dev->dev);
@@ -1540,7 +1540,7 @@
}
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -8419,12 +8419,8 @@ static int ipw2100_get_firmware(struct i
+@@ -8411,12 +8411,8 @@ static int ipw2100_get_firmware(struct i
rc = request_firmware(&fw->fw_entry, fw_name, &priv->pci_dev->dev);
@@ -1580,7 +1580,7 @@
else
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
-@@ -990,13 +990,8 @@ static void iwl_req_fw_callback(const st
+@@ -1010,13 +1010,8 @@ static void iwl_req_fw_callback(const st
memset(&pieces, 0, sizeof(pieces));
@@ -1608,7 +1608,7 @@
}
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
-@@ -427,11 +427,8 @@ static void mwifiex_fw_dpc(const struct
+@@ -394,11 +394,8 @@ static void mwifiex_fw_dpc(const struct
bool init_failed = false;
struct wireless_dev *wdev;
@@ -1702,7 +1702,7 @@
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
-@@ -1675,7 +1675,6 @@ static int ezusb_probe(struct usb_interf
+@@ -1669,7 +1669,6 @@ static int ezusb_probe(struct usb_interf
if (ezusb_firmware_download(upriv, &firmware) < 0)
goto error;
} else {
@@ -1777,7 +1777,7 @@
rt2x00_err(rt2x00dev, "Failed to read Firmware\n");
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
-@@ -115,7 +115,6 @@ void rtl_fw_cb(const struct firmware *fi
+@@ -114,7 +114,6 @@ void rtl_fw_cb(const struct firmware *fi
if (!err)
goto found_alt;
}
@@ -1787,7 +1787,7 @@
}
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
-@@ -97,7 +97,6 @@ static void rtl92se_fw_cb(const struct f
+@@ -94,7 +94,6 @@ static void rtl92se_fw_cb(const struct f
"Firmware callback routine entered!\n");
complete(&rtlpriv->firmware_loading_complete);
if (!firmware) {
@@ -1942,7 +1942,7 @@
}
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
-@@ -3983,10 +3983,8 @@ static ssize_t ipr_store_update_fw(struc
+@@ -3993,10 +3993,8 @@ static ssize_t ipr_store_update_fw(struc
len = snprintf(fname, 99, "%s", buf);
fname[len-1] = '\0';
@@ -1956,7 +1956,7 @@
--- a/drivers/scsi/pm8001/pm8001_ctl.c
+++ b/drivers/scsi/pm8001/pm8001_ctl.c
-@@ -687,10 +687,6 @@ static ssize_t pm8001_store_update_fw(st
+@@ -685,10 +685,6 @@ static ssize_t pm8001_store_update_fw(st
pm8001_ha->dev);
if (ret) {
@@ -1980,7 +1980,7 @@
}
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
-@@ -5350,8 +5350,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
+@@ -5365,8 +5365,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
@@ -1989,7 +1989,7 @@
ql_log(ql_log_info, vha, 0x0084,
"Firmware images can be retrieved from: "QLA_FW_URL ".\n");
return QLA_FUNCTION_FAILED;
-@@ -5453,8 +5451,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
+@@ -5468,8 +5466,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
@@ -2015,7 +2015,7 @@
if (qla82xx_validate_firmware_blob(vha,
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -5413,8 +5413,6 @@ qla2x00_request_firmware(scsi_qla_host_t
+@@ -5428,8 +5428,6 @@ qla2x00_request_firmware(scsi_qla_host_t
goto out;
if (request_firmware(&blob->fw, blob->name, &ha->pdev->dev)) {
@@ -2041,7 +2041,7 @@
fw->size, fwname);
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
-@@ -2230,16 +2230,12 @@ struct net_device *init_ft1000_card(stru
+@@ -2231,16 +2231,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");
@@ -2074,34 +2074,6 @@
size = max_t(uint, dsp_fw->size, 4096);
pFileStart = kmalloc(size, GFP_KERNEL);
---- a/drivers/staging/media/as102/as102_fw.c
-+++ b/drivers/staging/media/as102/as102_fw.c
-@@ -185,11 +185,8 @@ int as102_fw_upload(struct as10x_bus_ada
-
- /* request kernel to locate firmware file: part1 */
- errno = request_firmware(&firmware, fw1, &dev->dev);
-- if (errno < 0) {
-- pr_err("%s: unable to locate firmware file: %s\n",
-- DRIVER_NAME, fw1);
-+ if (errno)
- goto error;
-- }
-
- /* initiate firmware upload */
- errno = as102_firmware_upload(bus_adap, cmd_buf, firmware);
-@@ -208,11 +205,8 @@ int as102_fw_upload(struct as10x_bus_ada
-
- /* request kernel to locate firmware file: part2 */
- errno = request_firmware(&firmware, fw2, &dev->dev);
-- if (errno < 0) {
-- pr_err("%s: unable to locate firmware file: %s\n",
-- DRIVER_NAME, fw2);
-+ if (errno)
- goto error;
-- }
-
- /* initiate firmware upload */
- errno = as102_firmware_upload(bus_adap, cmd_buf, firmware);
--- 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
@@ -2162,7 +2134,7 @@
if (0 != ret) {
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
-@@ -767,8 +767,6 @@ static int fw_load(struct IR_tx *tx)
+@@ -768,8 +768,6 @@ static int fw_load(struct IR_tx *tx)
/* Request codeset data file */
ret = request_firmware(&fw_entry, "haup-ir-blaster.bin", tx->ir->l.dev);
if (ret != 0) {
@@ -2173,11 +2145,11 @@
}
--- a/drivers/staging/rtl8192u/r819xU_firmware.c
+++ b/drivers/staging/rtl8192u/r819xU_firmware.c
-@@ -242,10 +242,8 @@ bool init_firmware(struct net_device *de
+@@ -241,10 +241,8 @@ bool init_firmware(struct net_device *de
*/
if (rst_opt == OPT_SYSTEM_RESET) {
rc = request_firmware(&fw_entry, fw_name[init_step],&priv->udev->dev);
-- if (rc < 0 ) {
+- if (rc < 0) {
- RT_TRACE(COMP_ERR, "request firmware fail!\n");
+ if (rc)
goto download_firmware_fail;
@@ -2187,14 +2159,15 @@
RT_TRACE(COMP_ERR, "img file size exceed the container buffer fail!\n");
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
-@@ -49,7 +49,6 @@ static void rtl871x_load_fw_cb(const str
- if (!firmware) {
- struct usb_device *udev = padapter->dvobjpriv.pusbdev;
- struct usb_interface *pusb_intf = padapter->pusb_intf;
-- dev_err(&udev->dev, "r8712u: Firmware request failed\n");
- usb_put_dev(udev);
- usb_set_intfdata(pusb_intf, NULL);
- return;
+@@ -71,8 +71,6 @@ int rtl871x_load_fw(struct _adapter *pad
+ dev_info(dev, "r8712u: Loading firmware from \"%s\"\n", firmware_file);
+ rc = request_firmware_nowait(THIS_MODULE, 1, firmware_file, dev,
+ GFP_KERNEL, padapter, rtl871x_load_fw_cb);
+- if (rc)
+- dev_err(dev, "r8712u: Firmware request error %d\n", rc);
+ return rc;
+ }
+ MODULE_FIRMWARE("rtlwifi/rtl8712u.bin");
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -393,11 +393,8 @@ static int slic_card_download_gbrcv(stru
@@ -2487,7 +2460,7 @@
}
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
-@@ -1490,10 +1490,8 @@ static int ti_download_firmware(struct t
+@@ -1485,10 +1485,8 @@ static int ti_download_firmware(struct t
}
status = request_firmware(&fw_p, buf, &dev->dev);
}
@@ -2646,7 +2619,7 @@
filename, emu->firmware->size);
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
-@@ -1644,10 +1644,8 @@ static void azx_firmware_cb(const struct
+@@ -1662,10 +1662,8 @@ static void azx_firmware_cb(const struct
struct azx *chip = card->private_data;
struct pci_dev *pci = chip->pci;
Modified: dists/trunk/linux/debian/patches/bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch Tue Dec 9 02:55:16 2014 (r22148)
+++ dists/trunk/linux/debian/patches/bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch Tue Dec 9 03:06:08 2014 (r22149)
@@ -28,9 +28,9 @@
---
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -39,6 +39,9 @@
- #include <linux/pm_runtime.h>
- #include <linux/vga_switcheroo.h>
+@@ -41,6 +41,9 @@
+ #include <drm/drm_gem.h>
+
#include "drm_crtc_helper.h"
+#include <linux/namei.h>
+#include <linux/path.h>
@@ -38,7 +38,7 @@
/*
* KMS wrapper.
* - 2.0.0 - initial interface
-@@ -341,6 +344,42 @@ static struct drm_driver driver_old = {
+@@ -362,6 +365,42 @@ static struct drm_driver driver_old = {
static struct drm_driver kms_driver;
@@ -81,7 +81,7 @@
static int radeon_kick_out_firmware_fb(struct pci_dev *pdev)
{
struct apertures_struct *ap;
-@@ -367,6 +406,12 @@ static int radeon_pci_probe(struct pci_d
+@@ -388,6 +427,12 @@ static int radeon_pci_probe(struct pci_d
{
int ret;
@@ -94,7 +94,7 @@
/* Get rid of things like offb */
ret = radeon_kick_out_firmware_fb(pdev);
if (ret)
-@@ -586,6 +631,7 @@ static struct pci_driver *pdriver;
+@@ -610,6 +655,7 @@ static struct pci_driver *pdriver;
static struct pci_driver radeon_pci_driver = {
.name = DRIVER_NAME,
.id_table = pciidlist,
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 Tue Dec 9 02:55:16 2014 (r22148)
+++ dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch Tue Dec 9 03:06:08 2014 (r22149)
@@ -32,7 +32,7 @@
a single hierarchy
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1003,6 +1003,14 @@ config MEMCG
+@@ -1005,6 +1005,14 @@ config MEMCG
disable memory resource controller and you can avoid overheads.
(and lose benefits of memory resource controller)
@@ -49,8 +49,8 @@
depends on MEMCG && SWAP
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -5359,7 +5359,7 @@ static void cgroup_release_agent(struct
- mutex_unlock(&cgroup_mutex);
+@@ -5299,7 +5299,7 @@ out_free:
+ kfree(pathbuf);
}
-static int __init cgroup_disable(char *str)
@@ -58,7 +58,7 @@
{
struct cgroup_subsys *ss;
char *token;
-@@ -5371,17 +5371,29 @@ static int __init cgroup_disable(char *s
+@@ -5311,17 +5311,29 @@ static int __init cgroup_disable(char *s
for_each_subsys(ss, i) {
if (!strcmp(token, ss->name)) {
@@ -93,7 +93,7 @@
printk("cgroup: using legacy files on the default hierarchy\n");
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
-@@ -6297,6 +6297,9 @@ static void mem_cgroup_bind(struct cgrou
+@@ -6196,6 +6196,9 @@ static void mem_cgroup_bind(struct cgrou
}
struct cgroup_subsys memory_cgrp_subsys = {
Modified: dists/trunk/linux/debian/patches/features/arm/dts-sun7i-Add-Banana-Pi-board.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/arm/dts-sun7i-Add-Banana-Pi-board.patch Tue Dec 9 02:55:16 2014 (r22148)
+++ dists/trunk/linux/debian/patches/features/arm/dts-sun7i-Add-Banana-Pi-board.patch Tue Dec 9 03:06:08 2014 (r22149)
@@ -19,14 +19,14 @@
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -414,6 +414,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+@@ -435,6 +435,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
sun6i-a31-hummingbird.dtb \
sun6i-a31-m9.dtb
dtb-$(CONFIG_MACH_SUN7I) += \
+ sun7i-a20-bananapi.dtb \
sun7i-a20-cubieboard2.dtb \
sun7i-a20-cubietruck.dtb \
- sun7i-a20-i12-tvbox.dtb \
+ sun7i-a20-hummingbird.dtb \
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -0,0 +1,214 @@
Modified: dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch Tue Dec 9 02:55:16 2014 (r22148)
+++ dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch Tue Dec 9 03:06:08 2014 (r22149)
@@ -28,7 +28,7 @@
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -3132,6 +3132,10 @@ bytes respectively. Such letter suffixes
+@@ -3397,6 +3397,10 @@ bytes respectively. Such letter suffixes
switches= [HW,M68k]
@@ -41,7 +41,7 @@
on older distributions. When this option is enabled
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -2384,6 +2384,14 @@ config X86_X32
+@@ -2455,6 +2455,14 @@ config X86_X32
elf32_x86_64 support enabled to compile a kernel with this
option set.
@@ -58,7 +58,7 @@
depends on IA32_EMULATION || X86_X32
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
-@@ -149,6 +149,12 @@ do { \
+@@ -154,6 +154,12 @@ do { \
#else /* CONFIG_X86_32 */
@@ -71,7 +71,7 @@
/*
* This is used to ensure we don't load something for the wrong architecture.
*/
-@@ -157,7 +163,7 @@ do { \
+@@ -162,7 +168,7 @@ do { \
#define compat_elf_check_arch(x) \
(elf_check_arch_ia32(x) || \
@@ -82,7 +82,7 @@
# error "The following code assumes __USER32_DS == __USER_DS"
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
-@@ -621,8 +621,12 @@ system_call_fastpath:
+@@ -414,8 +414,12 @@ system_call_fastpath:
#if __SYSCALL_MASK == ~0
cmpq $__NR_syscall_max,%rax
#else
@@ -95,9 +95,9 @@
+ .byte P6_NOP4
+system_call_fast_compare_end:
#endif
- ja badsys
+ ja ret_from_sys_call /* and return regs->ax */
movq %r10,%rcx
-@@ -740,8 +744,12 @@ tracesys:
+@@ -520,8 +524,12 @@ tracesys_phase2:
#if __SYSCALL_MASK == ~0
cmpq $__NR_syscall_max,%rax
#else
@@ -110,9 +110,9 @@
+ .byte P6_NOP4
+system_call_trace_compare_end:
#endif
- ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
+ ja int_ret_from_sys_call /* RAX(%rsp) is already set */
movq %r10,%rcx /* fixup for C */
-@@ -813,6 +821,16 @@ int_restore_rest:
+@@ -593,6 +601,16 @@ int_restore_rest:
CFI_ENDPROC
END(system_call)
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Tue Dec 9 02:55:16 2014 (r22148)
+++ dists/trunk/linux/debian/patches/series Tue Dec 9 03:06:08 2014 (r22149)
@@ -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
@@ -50,19 +50,14 @@
bugfix/arm/omap-musb-choice.patch
bugfix/mips/disable-advansys.patch
bugfix/m68k/ethernat-kconfig.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-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.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
@@ -70,19 +65,6 @@
features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch
features/arm/dts-sun7i-Add-Banana-Pi-board.patch
features/arm/dts-sunxi-Banana-Pi-increase-startup-delay-for-the-GMAC-PHY-regulator.patch
-features/arm/dts-sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME.patch
-features/arm64/drivers-net-xgene-Preparing-for-adding-10GbE-support.patch
-features/arm64/drivers-net-xgene-Add-10GbE-support.patch
-features/arm64/drivers-net-xgene-Add-10GbE-ethtool-support.patch
-features/arm64/drivers-net-xgene-Preparing-for-adding-SGMII-based-1.patch
-features/arm64/drivers-net-xgene-Add-SGMII-based-1GbE-support.patch
-features/arm64/drivers-net-xgene-Add-SGMII-based-1GbE-ethtool-suppo.patch
-features/arm64/drivers-net-xgene-Rewrite-buggy-loop-in-xgene_enet_e.patch
-features/arm64/drivers-net-xgene-Backward-compatibility-with-older-.patch
-features/arm64/drivers-net-xgene-fix-Use-separate-resources.patch
-features/arm64/dtb-Add-10GbE-node-to-APM-X-Gene-SoC-device-tree.patch
-features/arm64/dtb-Add-SGMII-based-1GbE-node-to-APM-X-Gene-SoC-devi.patch
-features/arm64/dtb-xgene-fix-Backward-compatibility-with-older-firm.patch
# Miscellaneous bug fixes
bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
@@ -91,12 +73,7 @@
debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch
bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch
-bugfix/all/drivers-net-Disable-UFO-through-virtio.patch
bugfix/all/revert-drivers-net-disable-ufo-through-virtio-in-macvtap-and-tun.patch
-bugfix/all/xen-netback-make-feature-rx-notify-mandatory.patch
-bugfix/all/xen-netback-fix-unlimited-guest-Rx-internal-queue-an.patch
-bugfix/all/xen-netback-reintroduce-guest-Rx-stall-detection.patch
-bugfix/all/of-fdt-memblock_reserve-memreserve-regions-in-the-ca.patch
# Miscellaneous features
features/all/efi-autoload-efivars.patch
More information about the Kernel-svn-changes
mailing list