[kernel] r22505 - in dists/trunk/linux/debian: . patches patches/bugfix/all patches/bugfix/m68k patches/bugfix/x86 patches/debian patches/features/all patches/features/all/psmouse patches/features/arm patches/features/mips
Ben Hutchings
benh at moszumanska.debian.org
Mon Apr 13 02:02:26 UTC 2015
Author: benh
Date: Mon Apr 13 02:02:26 2015
New Revision: 22505
Log:
Update to 4.0
Deleted:
dists/trunk/linux/debian/patches/bugfix/all/btrfs-simplify-insert_orphan_item.patch
dists/trunk/linux/debian/patches/bugfix/all/ib-core-prevent-integer-overflow-in-ib_umem_get.patch
dists/trunk/linux/debian/patches/bugfix/all/ipv6-don-t-reduce-hop-limit-for-an-interface.patch
dists/trunk/linux/debian/patches/bugfix/m68k/ethernat-kconfig.patch
dists/trunk/linux/debian/patches/bugfix/x86/acpi-video-add-disable_native_backlight-quirk-for-samsung-510r.patch
dists/trunk/linux/debian/patches/bugfix/x86/acpi-video-add-disable_native_backlight-quirk-for-samsung-730u3e-740u3e.patch
dists/trunk/linux/debian/patches/bugfix/x86/acpi-video-disable-native-backlight-on-samsung-series-9.patch
dists/trunk/linux/debian/patches/bugfix/x86/drm-i915-quietly-reject-attempts-to-create-non-pagealigned-stolen-objects.patch
dists/trunk/linux/debian/patches/bugfix/x86/x86-microcode-intel-guard-against-stack-overflow-in-.patch
dists/trunk/linux/debian/patches/features/all/efi-expose-underlying-uefi-firmware-platform-size-to.patch
dists/trunk/linux/debian/patches/features/all/psmouse/input-psmouse-disable-changing-resolution-rate-scale.patch
dists/trunk/linux/debian/patches/features/all/psmouse/input-psmouse-disable-palm-detection-in-the-focaltec.patch
dists/trunk/linux/debian/patches/features/all/psmouse/input-psmouse-ensure-that-focaltech-reports-consiste.patch
dists/trunk/linux/debian/patches/features/all/psmouse/input-psmouse-remove-hardcoded-touchpad-size-from-th.patch
dists/trunk/linux/debian/patches/features/all/psmouse/input-psmouse-support-for-the-focaltech-ps-2-protoco.patch
dists/trunk/linux/debian/patches/features/arm/ARM-dts-sun4i-cubieboard-add-axp209-regulator-nodes.patch
dists/trunk/linux/debian/patches/features/arm/ARM-dts-sun5i-Enable-axp209-support-on-A13-OLinuxIno.patch
dists/trunk/linux/debian/patches/features/arm/ARM-dts-sun7i-cubieboard2-add-axp209-regulator-nodes.patch
dists/trunk/linux/debian/patches/features/arm/ARM-dts-sun7i-cubietruck-add-axp209-regulator-nodes.patch
dists/trunk/linux/debian/patches/features/arm/ARM-dts-sunxi-Add-dtsi-for-AXP209-PMIC.patch
dists/trunk/linux/debian/patches/features/arm/ARM-dts-sunxi-Add-simplefb-nodes-for-de_be0-lcd0-de_.patch
dists/trunk/linux/debian/patches/features/arm/ARM-dts-sunxi-Fixup-after-backport-of-axp209-support.patch
dists/trunk/linux/debian/patches/features/arm/dts-sun7i-Add-dts-file-for-Bananapro-board.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/kbuild-use-nostdinc-in-compile-tests.patch
dists/trunk/linux/debian/patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
dists/trunk/linux/debian/patches/debian/gitignore.patch
dists/trunk/linux/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
dists/trunk/linux/debian/patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
dists/trunk/linux/debian/patches/series
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Mon Apr 13 01:18:26 2015 (r22504)
+++ dists/trunk/linux/debian/changelog Mon Apr 13 02:02:26 2015 (r22505)
@@ -1,6 +1,6 @@
-linux (3.19.3-1~exp2) UNRELEASED; urgency=medium
+linux (4.0-1~exp1) UNRELEASED; urgency=medium
- *
+ * New upstream release: http://kernelnewbies.org/Linux_4.0
-- maximilian attems <maks at debian.org> Sun, 29 Mar 2015 23:31:57 +0200
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 Mon Apr 13 01:18:26 2015 (r22504)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Mon Apr 13 02:02:26 2015 (r22505)
@@ -81,7 +81,7 @@
rec = (const struct ihex_binrec *)fw->data;
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
-@@ -2505,10 +2505,9 @@ static int fore200e_load_and_start_fw(st
+@@ -2506,10 +2506,9 @@ static int fore200e_load_and_start_fw(st
return err;
sprintf(buf, "%s%s", fore200e->bus->proc_name, FW_EXT);
@@ -96,7 +96,7 @@
fw_size = firmware->size / sizeof(u32);
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
-@@ -377,10 +377,8 @@ static int ath3k_load_patch(struct usb_d
+@@ -393,10 +393,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);
-@@ -440,10 +438,8 @@ static int ath3k_load_syscfg(struct usb_
+@@ -456,10 +454,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
-@@ -328,8 +328,6 @@ static int btmrvl_sdio_download_helper(s
+@@ -355,8 +355,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;
}
-@@ -428,8 +426,6 @@ static int btmrvl_sdio_download_fw_w_hel
+@@ -455,8 +453,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
-@@ -1287,11 +1287,8 @@ static void sdma_load_firmware(const str
+@@ -1284,11 +1284,8 @@ static void sdma_load_firmware(const str
const struct sdma_script_start_addrs *addr;
unsigned short *ram_code;
@@ -231,9 +231,9 @@
size = 0;
where = 0;
---- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
-+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
-@@ -1496,10 +1496,8 @@ nvc0_graph_ctor_fw(struct nvc0_graph_pri
+--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
++++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+@@ -1507,10 +1507,8 @@ gf100_gr_ctor_fw(struct gf100_gr_priv *p
if (ret) {
snprintf(f, sizeof(f), "nouveau/%s", fwname);
ret = request_firmware(&fw, f, nv_device_base(device));
@@ -262,7 +262,7 @@
printk(KERN_ERR
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
-@@ -811,10 +811,6 @@ int ni_init_microcode(struct radeon_devi
+@@ -812,10 +812,6 @@ int ni_init_microcode(struct radeon_devi
out:
if (err) {
@@ -275,7 +275,7 @@
release_firmware(rdev->me_fw);
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
-@@ -1029,10 +1029,7 @@ static int r100_cp_init_microcode(struct
+@@ -1039,10 +1039,7 @@ static int r100_cp_init_microcode(struct
}
err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);
@@ -289,7 +289,7 @@
rdev->me_fw->size, fw_name);
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
-@@ -2518,10 +2518,6 @@ int r600_init_microcode(struct radeon_de
+@@ -2519,10 +2519,6 @@ int r600_init_microcode(struct radeon_de
out:
if (err) {
@@ -329,7 +329,7 @@
dev_priv->me_fw->size, fw_name);
--- a/drivers/infiniband/hw/qib/qib_sd7220.c
+++ b/drivers/infiniband/hw/qib/qib_sd7220.c
-@@ -405,10 +405,8 @@ int qib_sd7220_init(struct qib_devdata *
+@@ -406,10 +406,8 @@ int qib_sd7220_init(struct qib_devdata *
}
ret = request_firmware(&fw, SD7220_FW_NAME, &dd->pcidev->dev);
@@ -343,7 +343,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
-@@ -1942,10 +1942,8 @@ static int mxt_load_fw(struct device *de
+@@ -1892,10 +1892,8 @@ static int mxt_load_fw(struct device *de
int ret;
ret = request_firmware(&fw, fn, dev);
@@ -742,7 +742,7 @@
GFP_KERNEL | GFP_DMA);
--- a/drivers/media/pci/ttpci/av7110.c
+++ b/drivers/media/pci/ttpci/av7110.c
-@@ -1531,16 +1531,9 @@ static int get_firmware(struct av7110* a
+@@ -1534,16 +1534,9 @@ static int get_firmware(struct av7110* a
/* request the av7110 firmware, this will block until someone uploads it */
ret = request_firmware(&fw, "dvb-ttpci-01.fw", &av7110->dev->pci->dev);
if (ret) {
@@ -836,7 +836,7 @@
fw_data = (void *)fw_entry->data;
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
-@@ -3834,10 +3834,8 @@ static int pvr_boot(struct bttv *btv)
+@@ -3912,10 +3912,8 @@ static int pvr_boot(struct bttv *btv)
int rc;
rc = request_firmware(&fw_entry, "hcwamc.rbf", &btv->c.pci->dev);
@@ -961,7 +961,7 @@
printk(KERN_ERR "ERROR: Firmware size mismatch "
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
-@@ -1980,11 +1980,7 @@ void cx23885_card_setup(struct cx23885_d
+@@ -2165,11 +2165,7 @@ void cx23885_card_setup(struct cx23885_d
cinfo.rev, filename);
ret = request_firmware(&fw, filename, &dev->pci->dev);
@@ -1063,7 +1063,7 @@
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
-@@ -2304,10 +2304,8 @@ static int s2255_probe(struct usb_interf
+@@ -2299,10 +2299,8 @@ static int s2255_probe(struct usb_interf
}
/* load the first chunk */
if (request_firmware(&dev->fw_data->fw,
@@ -1104,23 +1104,9 @@
printk(KERN_INFO "%s() firmware read %Zu bytes.\n",
__func__, fw->size);
---- a/drivers/staging/media/tlg2300/pd-main.c
-+++ b/drivers/staging/media/tlg2300/pd-main.c
-@@ -219,10 +219,8 @@ static int firmware_download(struct usb_
- size_t max_packet_size;
-
- ret = request_firmware(&fw, firmware_name, &udev->dev);
-- if (ret) {
-- log("download err : %d", ret);
-+ if (ret)
- return ret;
-- }
-
- fwlength = fw->size;
-
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
-@@ -302,11 +302,8 @@ static long download_firmware(struct kim
+@@ -308,11 +308,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) ||
@@ -1230,7 +1216,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
-@@ -12953,11 +12953,8 @@ static int bnx2x_init_firmware(struct bn
+@@ -12976,11 +12976,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);
@@ -1245,7 +1231,7 @@
if (rc) {
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -11325,11 +11325,8 @@ static int tg3_request_firmware(struct t
+@@ -11337,11 +11337,8 @@ static int tg3_request_firmware(struct t
{
const struct tg3_firmware_hdr *fw_hdr;
@@ -1464,7 +1450,7 @@
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
-@@ -3927,12 +3927,8 @@ static int reset_atmel_card(struct net_d
+@@ -3917,12 +3917,8 @@ static int reset_atmel_card(struct net_d
strcpy(priv->firmware_id, "atmel_at76c502.bin");
}
err = request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev);
@@ -1480,7 +1466,7 @@
int success = 0;
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -2215,19 +2215,8 @@ int b43_do_request_fw(struct b43_request
+@@ -2253,19 +2253,8 @@ int b43_do_request_fw(struct b43_request
}
err = request_firmware(&ctx->blob, ctx->fwname,
ctx->dev->dev->dev);
@@ -1582,7 +1568,7 @@
else
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
-@@ -1096,13 +1096,8 @@ static void iwl_req_fw_callback(const st
+@@ -1078,13 +1078,8 @@ static void iwl_req_fw_callback(const st
if (!pieces)
return;
@@ -1610,7 +1596,7 @@
}
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
-@@ -394,11 +394,8 @@ static void mwifiex_fw_dpc(const struct
+@@ -401,11 +401,8 @@ static void mwifiex_fw_dpc(const struct
bool init_failed = false;
struct wireless_dev *wdev;
@@ -1625,7 +1611,7 @@
adapter->firmware = firmware;
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
-@@ -5708,16 +5708,12 @@ static int mwl8k_firmware_load_success(s
+@@ -5711,16 +5711,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;
@@ -1643,7 +1629,7 @@
priv->fw_helper = fw;
rc = mwl8k_request_fw(priv, priv->fw_pref, &priv->fw_ucode,
true);
-@@ -5752,11 +5748,8 @@ static void mwl8k_fw_state_machine(const
+@@ -5755,11 +5751,8 @@ static void mwl8k_fw_state_machine(const
break;
case FW_STATE_LOADING_ALT:
@@ -1656,7 +1642,7 @@
priv->fw_ucode = fw;
rc = mwl8k_firmware_load_success(priv);
if (rc)
-@@ -5794,10 +5787,8 @@ retry:
+@@ -5797,10 +5790,8 @@ retry:
/* Ask userland hotplug daemon for the device firmware */
rc = mwl8k_request_firmware(priv, fw_image, nowait);
@@ -1704,7 +1690,7 @@
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
-@@ -1669,7 +1669,6 @@ static int ezusb_probe(struct usb_interf
+@@ -1667,7 +1667,6 @@ static int ezusb_probe(struct usb_interf
if (ezusb_firmware_download(upriv, &firmware) < 0)
goto error;
} else {
@@ -1714,7 +1700,7 @@
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
-@@ -496,7 +496,6 @@ static void p54p_firmware_step2(const st
+@@ -499,7 +499,6 @@ static void p54p_firmware_step2(const st
int err;
if (!fw) {
@@ -1779,7 +1765,7 @@
rt2x00_err(rt2x00dev, "Failed to read Firmware\n");
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
-@@ -114,7 +114,6 @@ void rtl_fw_cb(const struct firmware *fi
+@@ -115,7 +115,6 @@ static void rtl_fw_do_work(const struct
if (!err)
goto found_alt;
}
@@ -1825,7 +1811,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
-@@ -749,10 +749,8 @@ static int wl12xx_fetch_firmware(struct
+@@ -762,10 +762,8 @@ static int wl12xx_fetch_firmware(struct
ret = request_firmware(&fw, fw_name, wl->dev);
@@ -1870,7 +1856,7 @@
static inline u16 get_bcdDevice(const struct usb_device *udev)
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
-@@ -4298,8 +4298,6 @@ static ushort AscInitAsc1000Driver(ASC_D
+@@ -4280,8 +4280,6 @@ static ushort AscInitAsc1000Driver(ASC_D
err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev);
if (err) {
@@ -1879,7 +1865,7 @@
asc_dvc->err_code |= ASC_IERR_MCODE_CHKSUM;
return err;
}
-@@ -4631,8 +4629,6 @@ static int AdvInitAsc3550Driver(ADV_DVC_
+@@ -4613,8 +4611,6 @@ static int AdvInitAsc3550Driver(ADV_DVC_
err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev);
if (err) {
@@ -1888,7 +1874,7 @@
asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM;
return err;
}
-@@ -5147,8 +5143,6 @@ static int AdvInitAsc38C0800Driver(ADV_D
+@@ -5129,8 +5125,6 @@ static int AdvInitAsc38C0800Driver(ADV_D
err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev);
if (err) {
@@ -1897,7 +1883,7 @@
asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM;
return err;
}
-@@ -5649,8 +5643,6 @@ static int AdvInitAsc38C1600Driver(ADV_D
+@@ -5631,8 +5625,6 @@ static int AdvInitAsc38C1600Driver(ADV_D
err = request_firmware(&fw, fwname, asc_dvc->drv_ptr->dev);
if (err) {
@@ -1908,7 +1894,7 @@
}
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
-@@ -397,8 +397,6 @@ static ssize_t asd_store_update_bios(str
+@@ -390,8 +390,6 @@ static ssize_t asd_store_update_bios(str
filename_ptr,
&asd_ha->pcidev->dev);
if (err) {
@@ -1944,7 +1930,7 @@
}
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
-@@ -3993,10 +3993,8 @@ static ssize_t ipr_store_update_fw(struc
+@@ -3995,10 +3995,8 @@ static ssize_t ipr_store_update_fw(struc
len = snprintf(fname, 99, "%s", buf);
fname[len-1] = '\0';
@@ -1971,7 +1957,7 @@
}
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
-@@ -1553,8 +1553,6 @@ qla1280_request_firmware(struct scsi_qla
+@@ -1552,8 +1552,6 @@ qla1280_request_firmware(struct scsi_qla
err = request_firmware(&fw, fwname, &ha->pdev->dev);
if (err) {
@@ -1982,7 +1968,7 @@
}
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
-@@ -5365,8 +5365,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
+@@ -5363,8 +5363,6 @@ qla2x00_load_risc(scsi_qla_host_t *vha,
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
@@ -1991,7 +1977,7 @@
ql_log(ql_log_info, vha, 0x0084,
"Firmware images can be retrieved from: "QLA_FW_URL ".\n");
return QLA_FUNCTION_FAILED;
-@@ -5468,8 +5466,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
+@@ -5466,8 +5464,6 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
/* Load firmware blob. */
blob = qla2x00_request_firmware(vha);
if (!blob) {
@@ -2017,7 +2003,7 @@
if (qla82xx_validate_firmware_blob(vha,
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -5428,8 +5428,6 @@ qla2x00_request_firmware(scsi_qla_host_t
+@@ -5356,8 +5356,6 @@ qla2x00_request_firmware(scsi_qla_host_t
goto out;
if (request_firmware(&blob->fw, blob->name, &ha->pdev->dev)) {
@@ -2043,7 +2029,7 @@
fw->size, fwname);
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
-@@ -2152,16 +2152,12 @@ struct net_device *init_ft1000_card(stru
+@@ -2131,16 +2131,12 @@ struct net_device *init_ft1000_card(stru
info->AsicID = ft1000_read_reg(dev, FT1000_REG_ASIC_ID);
if (info->AsicID == ELECTRABUZZ_ID) {
pr_debug("ELECTRABUZZ ASIC\n");
@@ -2136,18 +2122,19 @@
if (0 != ret) {
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
-@@ -759,8 +759,6 @@ static int fw_load(struct IR_tx *tx)
+@@ -762,9 +762,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) {
-- dev_err(tx->ir->l.dev, "firmware haup-ir-blaster.bin not available (%d)\n",
-- ret);
+- dev_err(tx->ir->l.dev,
+- "firmware haup-ir-blaster.bin not available (%d)\n",
+- ret);
ret = ret < 0 ? ret : -EFAULT;
goto out;
}
--- a/drivers/staging/rtl8192u/r819xU_firmware.c
+++ b/drivers/staging/rtl8192u/r819xU_firmware.c
-@@ -241,10 +241,8 @@ bool init_firmware(struct net_device *de
+@@ -243,10 +243,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);
@@ -2476,7 +2463,7 @@
release_firmware(fw_p);
--- a/drivers/video/fbdev/broadsheetfb.c
+++ b/drivers/video/fbdev/broadsheetfb.c
-@@ -741,10 +741,8 @@ static ssize_t broadsheet_loadstore_wave
+@@ -743,10 +743,8 @@ static ssize_t broadsheet_loadstore_wave
return -EINVAL;
err = request_firmware(&fw_entry, "broadsheet.wbf", dev);
@@ -2538,7 +2525,7 @@
if (snd_msnd_upload_host(chip, init_fw->data, init_fw->size) < 0) {
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
-@@ -543,10 +543,8 @@ static int sscape_upload_bootblock(struc
+@@ -544,10 +544,8 @@ static int sscape_upload_bootblock(struc
int ret;
ret = request_firmware(&init_fw, "scope.cod", card->dev);
@@ -2550,7 +2537,7 @@
ret = upload_dma_data(sscape, init_fw->data, init_fw->size);
release_firmware(init_fw);
-@@ -583,11 +581,8 @@ static int sscape_upload_microcode(struc
+@@ -584,11 +582,8 @@ static int sscape_upload_microcode(struc
snprintf(name, sizeof(name), "sndscape.co%d", version);
err = request_firmware(&init_fw, name, card->dev);
@@ -2579,7 +2566,7 @@
buf = firmware->data;
--- a/sound/pci/asihpi/hpidspcd.c
+++ b/sound/pci/asihpi/hpidspcd.c
-@@ -49,8 +49,6 @@ short hpi_dsp_code_open(u32 adapter, voi
+@@ -46,8 +46,6 @@ short hpi_dsp_code_open(u32 adapter, voi
err = request_firmware(&firmware, fw_name, &dev->dev);
if (err || !firmware) {
@@ -2621,7 +2608,7 @@
filename, emu->firmware->size);
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
-@@ -1662,10 +1662,8 @@ static void azx_firmware_cb(const struct
+@@ -1636,10 +1636,8 @@ static void azx_firmware_cb(const struct
struct azx *chip = card->private_data;
struct pci_dev *pci = chip->pci;
@@ -2635,7 +2622,7 @@
if (!chip->disabled) {
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
-@@ -2346,7 +2346,6 @@ static int snd_korg1212_create(struct sn
+@@ -2330,7 +2330,6 @@ static int snd_korg1212_create(struct sn
err = request_firmware(&dsp_code, "korg/k1212.dsp", &pci->dev);
if (err < 0) {
release_firmware(dsp_code);
@@ -2645,7 +2632,7 @@
}
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
-@@ -570,11 +570,8 @@ int snd_mixart_setup_firmware(struct mix
+@@ -571,11 +571,8 @@ int snd_mixart_setup_firmware(struct mix
for (i = 0; i < 3; i++) {
sprintf(path, "mixart/%s", fw_files[i]);
@@ -2676,7 +2663,7 @@
release_firmware(fw_entry);
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
-@@ -1245,11 +1245,8 @@ static int try_to_load_firmware(struct c
+@@ -1231,11 +1231,8 @@ static int try_to_load_firmware(struct c
if (!chip->fw_entry) {
err = request_firmware(&chip->fw_entry, "riptide.hex",
&chip->pci->dev);
@@ -2691,7 +2678,7 @@
if (err) {
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
-@@ -5167,11 +5167,8 @@ static int hdsp_request_fw_loader(struct
+@@ -5102,11 +5102,8 @@ static int hdsp_request_fw_loader(struct
return -EINVAL;
}
@@ -2740,7 +2727,7 @@
}
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
-@@ -3284,11 +3284,8 @@ int snd_cs46xx_start_dsp(struct snd_cs46
+@@ -3253,11 +3253,8 @@ int snd_cs46xx_start_dsp(struct snd_cs46
#ifdef CONFIG_SND_CS46XX_NEW_DSP
for (i = 0; i < CS46XX_DSP_MODULES; i++) {
err = load_firmware(chip, &chip->modules[i], module_names[i]);
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 Mon Apr 13 01:18:26 2015 (r22504)
+++ dists/trunk/linux/debian/patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch Mon Apr 13 02:02:26 2015 (r22505)
@@ -30,7 +30,7 @@
# cc-option-align
# Prefix align with either -falign or -malign
-@@ -126,16 +126,17 @@ cc-option-align = $(subst -functions=0,,
+@@ -126,14 +126,15 @@ 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,\
@@ -38,20 +38,18 @@
+ $(CC) $(NOSTDINC_FLAGS) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
# cc-version
- # Usage gcc-ver := $(call cc-version)
-cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
+cc-version = $(shell $(CONFIG_SHELL) \
+ $(srctree)/scripts/gcc-version.sh $(CC) $(NOSTDINC_FLAGS))
# cc-fullversion
- # Usage gcc-ver := $(call cc-fullversion)
cc-fullversion = $(shell $(CONFIG_SHELL) \
- $(srctree)/scripts/gcc-version.sh -p $(CC))
+ $(srctree)/scripts/gcc-version.sh -p $(CC) $(NOSTDINC_FLAGS))
# cc-ifversion
# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
-@@ -149,7 +150,7 @@ cc-ldoption = $(call try-run,\
+@@ -147,7 +148,7 @@ cc-ldoption = $(call try-run,\
# ld-option
# Usage: LDFLAGS += $(call ld-option, -X)
ld-option = $(call try-run,\
@@ -62,7 +60,7 @@
# Usage: KBUILD_ARFLAGS := $(call ar-option,D)
--- a/Makefile
+++ b/Makefile
-@@ -624,6 +624,8 @@ else
+@@ -621,6 +621,8 @@ else
KBUILD_CFLAGS += -O2
endif
@@ -71,7 +69,7 @@
# 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-
+@@ -751,7 +753,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/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch Mon Apr 13 01:18:26 2015 (r22504)
+++ dists/trunk/linux/debian/patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch Mon Apr 13 02:02:26 2015 (r22505)
@@ -16,19 +16,14 @@
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
- net/ieee802154/af_ieee802154.c | 2 +-
+ net/ieee802154/socket.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c
-index cd949d5..8f49dd5 100644
---- a/net/ieee802154/af_ieee802154.c
-+++ b/net/ieee802154/af_ieee802154.c
-@@ -363,4 +363,4 @@ module_init(af_ieee802154_init);
+--- a/net/ieee802154/socket.c
++++ b/net/ieee802154/socket.c
+@@ -1122,4 +1122,4 @@ module_init(af_ieee802154_init);
module_exit(af_ieee802154_remove);
MODULE_LICENSE("GPL");
-MODULE_ALIAS_NETPROTO(PF_IEEE802154);
+/* MODULE_ALIAS_NETPROTO(PF_IEEE802154); */
---
-1.7.2.3
-
Modified: dists/trunk/linux/debian/patches/debian/gitignore.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/gitignore.patch Mon Apr 13 01:18:26 2015 (r22504)
+++ dists/trunk/linux/debian/patches/debian/gitignore.patch Mon Apr 13 02:02:26 2015 (r22505)
@@ -5,7 +5,7 @@
--- a/.gitignore
+++ b/.gitignore
-@@ -47,17 +47,6 @@
+@@ -49,22 +49,11 @@ Module.symvers
/Module.markers
#
@@ -14,6 +14,11 @@
-/debian/
-
-#
+ # tar directory (make tar*-pkg)
+ #
+ /tar-install/
+
+ #
-# git files that we don't want to ignore even it they are dot-files
-#
-!.gitignore
Modified: dists/trunk/linux/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch Mon Apr 13 01:18:26 2015 (r22504)
+++ dists/trunk/linux/debian/patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch Mon Apr 13 02:02:26 2015 (r22505)
@@ -15,9 +15,9 @@
((void __user *)sg[j].addr_bus, sg_list[j].virt,
^
---- a/drivers/message/i2o/Kconfig
-+++ b/drivers/message/i2o/Kconfig
-@@ -37,6 +37,7 @@ config I2O_LCT_NOTIFY_ON_CHANGES
+--- a/drivers/staging/i2o/Kconfig
++++ b/drivers/staging/i2o/Kconfig
+@@ -36,6 +36,7 @@ config I2O_LCT_NOTIFY_ON_CHANGES
config I2O_EXT_ADAPTEC
bool "Enable Adaptec extensions"
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 Mon Apr 13 01:18:26 2015 (r22504)
+++ dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch Mon Apr 13 02:02:26 2015 (r22505)
@@ -32,7 +32,7 @@
a single hierarchy
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -983,6 +983,14 @@ config MEMCG
+@@ -990,6 +990,14 @@ config MEMCG
Provides a memory resource controller that manages both anonymous
memory and page cache. (See Documentation/cgroups/memory.txt)
@@ -49,7 +49,7 @@
depends on MEMCG && SWAP
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -5366,7 +5366,7 @@ out_free:
+@@ -5370,7 +5370,7 @@ out_free:
kfree(pathbuf);
}
@@ -58,7 +58,7 @@
{
struct cgroup_subsys *ss;
char *token;
-@@ -5378,17 +5378,29 @@ static int __init cgroup_disable(char *s
+@@ -5382,17 +5382,29 @@ static int __init cgroup_disable(char *s
for_each_subsys(ss, i) {
if (!strcmp(token, ss->name)) {
@@ -93,8 +93,8 @@
printk("cgroup: using legacy files on the default hierarchy\n");
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
-@@ -5387,6 +5387,9 @@ static void mem_cgroup_bind(struct cgrou
- }
+@@ -5379,6 +5379,9 @@ static struct cftype memory_files[] = {
+ };
struct cgroup_subsys memory_cgrp_subsys = {
+#ifdef CONFIG_MEMCG_DISABLED
Modified: dists/trunk/linux/debian/patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch Mon Apr 13 01:18:26 2015 (r22504)
+++ dists/trunk/linux/debian/patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch Mon Apr 13 02:02:26 2015 (r22505)
@@ -50,19 +50,3 @@
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
}
---- a/arch/mips/include/asm/octeon/octeon-model.h
-+++ b/arch/mips/include/asm/octeon/octeon-model.h
-@@ -105,10 +105,13 @@
- #define OCTEON_CN63XX_PASS2_X (OCTEON_CN63XX_PASS2_0 | OM_IGNORE_MINOR_REVISION)
-
- #define OCTEON_CN61XX_PASS1_0 0x000d9300
-+#define OCTEON_CN61XX_PASS1_1 0x000d9301
-
- #define OCTEON_CN61XX (OCTEON_CN61XX_PASS1_0 | OM_IGNORE_REVISION)
- #define OCTEON_CN61XX_PASS1_X (OCTEON_CN61XX_PASS1_0 | OM_IGNORE_MINOR_REVISION)
-
-+#define OCTEON_UBNT_E200 (OCTEON_CN61XX_PASS1_1 | OM_IGNORE_REVISION)
-+
- /*
- * CN5XXX models with new revision encoding
- */
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Mon Apr 13 01:18:26 2015 (r22504)
+++ dists/trunk/linux/debian/patches/series Mon Apr 13 02:02:26 2015 (r22505)
@@ -39,14 +39,8 @@
# Arch bug fixes
bugfix/mips/disable-advansys.patch
-bugfix/m68k/ethernat-kconfig.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/acpi-video-add-disable_native_backlight-quirk-for-samsung-730u3e-740u3e.patch
-bugfix/x86/acpi-video-add-disable_native_backlight-quirk-for-samsung-510r.patch
-bugfix/x86/acpi-video-disable-native-backlight-on-samsung-series-9.patch
-bugfix/x86/drm-i915-quietly-reject-attempts-to-create-non-pagealigned-stolen-objects.patch
-bugfix/x86/x86-microcode-intel-guard-against-stack-overflow-in-.patch
# Arch features
features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
@@ -55,14 +49,6 @@
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/arm/dts-sun7i-Add-dts-file-for-Bananapro-board.patch
-features/arm/ARM-dts-sunxi-Add-simplefb-nodes-for-de_be0-lcd0-de_.patch
-features/arm/ARM-dts-sunxi-Add-dtsi-for-AXP209-PMIC.patch
-features/arm/ARM-dts-sun7i-cubieboard2-add-axp209-regulator-nodes.patch
-features/arm/ARM-dts-sun7i-cubietruck-add-axp209-regulator-nodes.patch
-features/arm/ARM-dts-sun4i-cubieboard-add-axp209-regulator-nodes.patch
-features/arm/ARM-dts-sun5i-Enable-axp209-support-on-A13-OLinuxIno.patch
-features/arm/ARM-dts-sunxi-Fixup-after-backport-of-axp209-support.patch
# Miscellaneous bug fixes
bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
@@ -73,20 +59,8 @@
bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch
bugfix/all/net-mv643xx-disable-tso-by-default.patch
bugfix/all/vfs-read-file_handle-only-once-in-handle_to_path.patch
-bugfix/all/ib-core-prevent-integer-overflow-in-ib_umem_get.patch
bugfix/all/ext4-allocate-entire-range-in-zero-range.patch
-bugfix/all/ipv6-don-t-reduce-hop-limit-for-an-interface.patch
debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch
# Miscellaneous features
features/all/efi-autoload-efi-pstore.patch
-features/all/efi-expose-underlying-uefi-firmware-platform-size-to.patch
-
-# Add FocalTech support to psmouse
-features/all/psmouse/input-psmouse-support-for-the-focaltech-ps-2-protoco.patch
-features/all/psmouse/input-psmouse-remove-hardcoded-touchpad-size-from-th.patch
-features/all/psmouse/input-psmouse-ensure-that-focaltech-reports-consiste.patch
-features/all/psmouse/input-psmouse-disable-changing-resolution-rate-scale.patch
-features/all/psmouse/input-psmouse-disable-palm-detection-in-the-focaltec.patch
-
-bugfix/all/btrfs-simplify-insert_orphan_item.patch
More information about the Kernel-svn-changes
mailing list