aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2016-01-12 20:50:41 +0000
committerHauke Mehrtens <hauke@openwrt.org>2016-01-12 20:50:41 +0000
commitc7377ba3fe9346b407140d0f5e7f33158cbcd301 (patch)
tree98357bd3296057219c0f48727cea5c5924553723 /target/linux/x86
parentf4b23769de50ab2172163d2135f2a82ae9396e30 (diff)
downloadmaster-187ad058-c7377ba3fe9346b407140d0f5e7f33158cbcd301.tar.gz
master-187ad058-c7377ba3fe9346b407140d0f5e7f33158cbcd301.tar.bz2
master-187ad058-c7377ba3fe9346b407140d0f5e7f33158cbcd301.zip
kernel: refresh patches for kernel 4.4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48222 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/patches-4.4/011-tune_lzma_options.patch2
-rw-r--r--target/linux/x86/patches-4.4/120-panic_on_unrecovered_nmi.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/x86/patches-4.4/011-tune_lzma_options.patch b/target/linux/x86/patches-4.4/011-tune_lzma_options.patch
index 9fe0ad2235..5f8f5d8218 100644
--- a/target/linux/x86/patches-4.4/011-tune_lzma_options.patch
+++ b/target/linux/x86/patches-4.4/011-tune_lzma_options.patch
@@ -1,6 +1,6 @@
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
-@@ -324,7 +324,7 @@
+@@ -324,7 +324,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
quiet_cmd_lzma = LZMA $@
cmd_lzma = (cat $(filter-out FORCE,$^) | \
diff --git a/target/linux/x86/patches-4.4/120-panic_on_unrecovered_nmi.patch b/target/linux/x86/patches-4.4/120-panic_on_unrecovered_nmi.patch
index 81cef53a66..0432686cf1 100644
--- a/target/linux/x86/patches-4.4/120-panic_on_unrecovered_nmi.patch
+++ b/target/linux/x86/patches-4.4/120-panic_on_unrecovered_nmi.patch
@@ -1,6 +1,6 @@
--- a/drivers/mfd/rdc321x-southbridge.c
+++ b/drivers/mfd/rdc321x-southbridge.c
-@@ -85,6 +85,8 @@
+@@ -85,6 +85,8 @@ static int rdc321x_sb_probe(struct pci_d
rdc321x_gpio_pdata.sb_pdev = pdev;
rdc321x_wdt_pdata.sb_pdev = pdev;