Package: src:linux
Version: < 4.0
Severity: wishlist
Tags: patch
The attached patch updates debian/patches/* to 4.0.
Works with rc6, rc5, rc4.
Patches which have been merged into 4.0 have been removed
from the series file (but not the tree), the remaining
patches have been updated as necessary.
I'm just submitting this so others do not have to reinvent
the wheel.
Index:
patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
===================================================================
---
patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
(revision 22460)
+++
patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
(working copy)
@@ -231,20 +231,6 @@
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
- if (ret) {
- snprintf(f, sizeof(f), "nouveau/%s", fwname);
- ret = request_firmware(&fw, f, nv_device_base(device));
-- if (ret) {
-- nv_error(priv, "failed to load %s\n", fwname);
-+ if (ret)
- return ret;
-- }
- }
-
- fuc->size = fw->size;
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -154,11 +154,8 @@ static int r128_cce_load_microcode(drm_r
@@ -1104,20 +1090,6 @@
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
@@ -2136,12 +2108,13 @@
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)
+@@ -759,9 +759,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;
}
Index: patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
===================================================================
--- patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
(revision 22460)
+++ patches/bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
(working copy)
@@ -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,13 +38,11 @@
+ $(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))
Index: patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
===================================================================
--- patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
(revision 22460)
+++ patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
(working copy)
@@ -16,14 +16,14 @@
Signed-off-by: Ben Hutchings <b...@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
+diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.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");
Index: patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
===================================================================
--- patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch (revision 22460)
+++ patches/debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch (working copy)
@@ -15,8 +15,8 @@
((void __user *)sg[j].addr_bus, sg_list[j].virt,
^
---- a/drivers/message/i2o/Kconfig
-+++ b/drivers/message/i2o/Kconfig
+--- a/drivers/staging/i2o/Kconfig
++++ b/drivers/staging/i2o/Kconfig
@@ -37,6 +37,7 @@ config I2O_LCT_NOTIFY_ON_CHANGES
config I2O_EXT_ADAPTEC
Index:
patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
===================================================================
---
patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
(revision 22460)
+++
patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
(working copy)
@@ -94,7 +94,7 @@
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5387,6 +5387,9 @@ static void mem_cgroup_bind(struct cgrou
- }
+ };
struct cgroup_subsys memory_cgrp_subsys = {
+#ifdef CONFIG_MEMCG_DISABLED
Index:
patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
===================================================================
--- patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
(revision 22460)
+++ patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
(working copy)
@@ -52,15 +52,10 @@
}
--- 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)
+@@ -160,6 +160,8 @@
+ /* CN60XX is same as CN61XX with 512 KB cache */
+ #define OCTEON_CN60XX OCTEON_CN61XX
- #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)
+
/*
Index: patches/series
===================================================================
--- patches/series (revision 22460)
+++ patches/series (working copy)
@@ -39,13 +38,9 @@
# 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
# Arch features
features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
@@ -54,8 +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
# Miscellaneous bug fixes
bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
@@ -69,4 +62,3 @@
# Miscellaneous features
features/all/efi-autoload-efi-pstore.patch
-features/all/efi-expose-underlying-uefi-firmware-platform-size-to.patch
