aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-28 10:58:35 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-28 18:17:32 +0100
commitaa95bdd80f05ae14705481df57e8ee0370452399 (patch)
treef28102101b867ab6af29118d7c0a821faed32617 /target/linux/generic
parent50b3044eebea8a3f840babaadc4e850214ac29c5 (diff)
downloadupstream-aa95bdd80f05ae14705481df57e8ee0370452399.tar.gz
upstream-aa95bdd80f05ae14705481df57e8ee0370452399.tar.bz2
upstream-aa95bdd80f05ae14705481df57e8ee0370452399.zip
kernel: bump 3.18 to 3.18.133
Refreshed all patches. Compile-tested on: adm5120 Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch4
-rw-r--r--target/linux/generic/pending-3.18/300-mips_expose_boot_raw.patch4
-rw-r--r--target/linux/generic/pending-3.18/301-mips_image_cmdline_hack.patch2
-rw-r--r--target/linux/generic/pending-3.18/304-mips_disable_fpu.patch2
-rw-r--r--target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch2
-rw-r--r--target/linux/generic/pending-3.18/902-debloat_proc.patch2
6 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch b/target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch
index c008aea41d..7a64ae7994 100644
--- a/target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1450,6 +1450,7 @@ config CPU_CAVIUM_OCTEON
+@@ -1453,6 +1453,7 @@ config CPU_CAVIUM_OCTEON
select CPU_SUPPORTS_HUGEPAGES
select USB_EHCI_BIG_ENDIAN_MMIO
select MIPS_L1_CACHE_SHIFT_7
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
help
The Cavium Octeon processor is a highly integrated chip containing
many ethernet hardware widgets for networking tasks. The processor
-@@ -1705,6 +1706,9 @@ config MIPS_MALTA_PM
+@@ -1708,6 +1709,9 @@ config MIPS_MALTA_PM
bool
default y
diff --git a/target/linux/generic/pending-3.18/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-3.18/300-mips_expose_boot_raw.patch
index 69d61f20a9..ab7c46f087 100644
--- a/target/linux/generic/pending-3.18/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/pending-3.18/300-mips_expose_boot_raw.patch
@@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -892,9 +892,6 @@ config FW_ARC
+@@ -895,9 +895,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
-@@ -2503,6 +2500,18 @@ config USE_OF
+@@ -2506,6 +2503,18 @@ config USE_OF
config BUILTIN_DTB
bool
diff --git a/target/linux/generic/pending-3.18/301-mips_image_cmdline_hack.patch b/target/linux/generic/pending-3.18/301-mips_image_cmdline_hack.patch
index c87d4480ce..993363c30f 100644
--- a/target/linux/generic/pending-3.18/301-mips_image_cmdline_hack.patch
+++ b/target/linux/generic/pending-3.18/301-mips_image_cmdline_hack.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -988,6 +988,10 @@ config SYNC_R4K
+@@ -991,6 +991,10 @@ config SYNC_R4K
config MIPS_MACHINE
def_bool n
diff --git a/target/linux/generic/pending-3.18/304-mips_disable_fpu.patch b/target/linux/generic/pending-3.18/304-mips_disable_fpu.patch
index 37ec9934ff..a28ca3ebe2 100644
--- a/target/linux/generic/pending-3.18/304-mips_disable_fpu.patch
+++ b/target/linux/generic/pending-3.18/304-mips_disable_fpu.patch
@@ -26,7 +26,7 @@ v2: incorporated changes suggested by Jonas Gorski
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -2495,6 +2495,20 @@ config MIPS_O32_FP64_SUPPORT
+@@ -2498,6 +2498,20 @@ config MIPS_O32_FP64_SUPPORT
If unsure, say N.
diff --git a/target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch
index 0cc8db9dca..b68238c937 100644
--- a/target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch
+++ b/target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch
@@ -206,7 +206,7 @@
+}
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
-@@ -373,14 +373,41 @@ static int __init init_jffs2_fs(void)
+@@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void)
BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
diff --git a/target/linux/generic/pending-3.18/902-debloat_proc.patch b/target/linux/generic/pending-3.18/902-debloat_proc.patch
index 95efe78ebc..8b68cd36fa 100644
--- a/target/linux/generic/pending-3.18/902-debloat_proc.patch
+++ b/target/linux/generic/pending-3.18/902-debloat_proc.patch
@@ -174,7 +174,7 @@
goto err;
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -2944,6 +2944,8 @@ static __net_initdata struct pernet_oper
+@@ -2945,6 +2945,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{