From aa95bdd80f05ae14705481df57e8ee0370452399 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 28 Jan 2019 10:58:35 +0100 Subject: [PATCH] kernel: bump 3.18 to 3.18.133 Refreshed all patches. Compile-tested on: adm5120 Runtime-tested on: none Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- target/linux/adm5120/patches-3.18/001-adm5120.patch | 2 +- target/linux/adm8668/patches-3.18/001-adm8668_arch.patch | 2 +- .../linux/generic/pending-3.18/132-mips_inline_dma_ops.patch | 4 ++-- .../linux/generic/pending-3.18/300-mips_expose_boot_raw.patch | 4 ++-- .../generic/pending-3.18/301-mips_image_cmdline_hack.patch | 2 +- target/linux/generic/pending-3.18/304-mips_disable_fpu.patch | 2 +- .../generic/pending-3.18/530-jffs2_make_lzma_available.patch | 2 +- target/linux/generic/pending-3.18/902-debloat_proc.patch | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 2e7f67dcb2..e63cef774e 100644 --- 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 3e0e3ff8aa..c0558f09b1 100644 --- 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 80e9ed1bbc..9a839f96da 100644 --- 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 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 --- 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 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 --- --- 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 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) { -- 2.25.1