kernel: bump 3.18 to 3.18.133
authorKoen Vandeputte <koen.vandeputte@ncentric.com>
Mon, 28 Jan 2019 09:58:35 +0000 (10:58 +0100)
committerKoen Vandeputte <koen.vandeputte@ncentric.com>
Mon, 28 Jan 2019 17:17:32 +0000 (18:17 +0100)
Refreshed all patches.

Compile-tested on: adm5120
Runtime-tested on: none

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
include/kernel-version.mk
target/linux/adm5120/patches-3.18/001-adm5120.patch
target/linux/adm8668/patches-3.18/001-adm8668_arch.patch
target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch
target/linux/generic/pending-3.18/300-mips_expose_boot_raw.patch
target/linux/generic/pending-3.18/301-mips_image_cmdline_hack.patch
target/linux/generic/pending-3.18/304-mips_disable_fpu.patch
target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch
target/linux/generic/pending-3.18/902-debloat_proc.patch

index 2e7f67d..e63cef7 100644 (file)
@@ -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
index 3e0e3ff..c0558f0 100644 (file)
@@ -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
  
index 80e9ed1..9a839f9 100644 (file)
@@ -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
  
index c008aea..7a64ae7 100644 (file)
@@ -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
  
index 69d61f2..ab7c46f 100644 (file)
@@ -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
  
index c87d448..993363c 100644 (file)
@@ -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
  
index 37ec993..a28ca3e 100644 (file)
@@ -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.
  
index 0cc8db9..b68238c 100644 (file)
 +}
 --- 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);
  
index 95efe78..8b68cd3 100644 (file)
                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)
  {