aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-01-12 20:50:41 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-01-12 20:50:41 +0000
commitba3a749f9b29b40784bb576651142c601d4a7211 (patch)
tree5adb2f84ad87b100b0a0bde6f1e0407aa32203e1 /target/linux/x86
parentbd99318c820c47af63c30dcf12fb3f929c257180 (diff)
downloadupstream-ba3a749f9b29b40784bb576651142c601d4a7211.tar.gz
upstream-ba3a749f9b29b40784bb576651142c601d4a7211.tar.bz2
upstream-ba3a749f9b29b40784bb576651142c601d4a7211.zip
kernel: refresh patches for kernel 4.4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 48222
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;