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>

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 2e7f67dcb210aa9e2a269e4db1aee49e49564ab8..e63cef774e2620d0fec128c0c39330df0773d551 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -2,12 +2,12 @@
 
 LINUX_RELEASE?=1
 
-LINUX_VERSION-3.18 = .132
+LINUX_VERSION-3.18 = .133
 LINUX_VERSION-4.9 = .152
 LINUX_VERSION-4.14 = .95
 LINUX_VERSION-4.19 = .16
 
-LINUX_KERNEL_HASH-3.18.132 = c187bd0322372bd34c862cbb06a1996a63524ccb401466362b57ede45901a879
+LINUX_KERNEL_HASH-3.18.133 = 3ec7f47365a8a050e629a5016e90e38a800e840c844901c979e9e796f8dc6711
 LINUX_KERNEL_HASH-4.9.152 = 90e47b85c09af47eefafe851685ee731538f640b0650a6a9cfa0234436708e39
 LINUX_KERNEL_HASH-4.14.95 = ce6729e3fca312520e3cb4f27993852dbb019d94c59c0b35cedab571f9cb58e4
 LINUX_KERNEL_HASH-4.19.16 = d8a088381fe3e7e5484c060dabcdda4b053ef7114f91cfd56db003a89bb11bdf

diff --git a/target/linux/adm5120/patches-3.18/001-adm5120.patch b/target/linux/adm5120/patches-3.18/001-adm5120.patch
index 3e0e3ff8aa6ea7d458c46d7d45b703cf2fb3ec4c..c0558f09b19f2d70b0487d986796d94b257fce90 100644 (file)
--- a/target/linux/adm5120/patches-3.18/001-adm5120.patch
+++ b/target/linux/adm5120/patches-3.18/001-adm5120.patch
@@ -25,7 +25,7 @@
  config MIPS_ALCHEMY
        bool "Alchemy processor based machines"
        select 64BIT_PHYS_ADDR
-@@ -834,6 +852,7 @@ config MIPS_PARAVIRT
+@@ -837,6 +855,7 @@ config MIPS_PARAVIRT
  
  endchoice
  

diff --git a/target/linux/adm8668/patches-3.18/001-adm8668_arch.patch b/target/linux/adm8668/patches-3.18/001-adm8668_arch.patch
index 80e9ed1bbcefbad5eb0b223ffd80c1ba96f5e279..9a839f96da429c36c0a66fcd54331fcbfad7714d 100644 (file)
--- a/target/linux/adm8668/patches-3.18/001-adm8668_arch.patch
+++ b/target/linux/adm8668/patches-3.18/001-adm8668_arch.patch
@@ -38,7 +38,7 @@
  config BCM63XX
        bool "Broadcom BCM63XX based boards"
        select BOOT_RAW
-@@ -834,6 +855,7 @@ config MIPS_PARAVIRT
+@@ -837,6 +858,7 @@ config MIPS_PARAVIRT
  
  endchoice
  

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 c008aea41dec5475b693111ccc116dc4de790c28..7a64ae7994676b25b0836f2b36bf634c5c239da3 100644 (file)
--- 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 69d61f20a9e4eee4f5c458fbf07cd0975a858ba5..ab7c46f08789a6087aca999b3dbaf35242da7f35 100644 (file)
--- 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 c87d4480ce259a6de5ef5f3a4e9f66607322e851..993363c30fb74d2965d617a237c3eb7663445b6b 100644 (file)
--- 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 37ec9934ff8a6bd14fd38c220cab7bddfa8c448f..a28ca3ebe260c82720b9131d0a1af6494270ed0d 100644 (file)
--- 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 0cc8db9dca848d3fb2b207384ad094f0fda3f35d..b68238c937342423e499ff1de9b54cebb41d0a28 100644 (file)
--- 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 95efe78ebce5eae6bd92aa7260b9d43e3df7eb5d..8b68cd36fa13e46e329cd06f7e2d067be75cc45f 100644 (file)
--- 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)
  {