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>
This commit is contained in:
Koen Vandeputte
2019-01-28 10:58:35 +01:00
parent 50b3044eeb
commit aa95bdd80f
9 changed files with 12 additions and 12 deletions

View 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

View 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

View 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

View 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

View 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

View 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.

View File

@@ -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);

View File

@@ -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)
{