Skip to content
Permalink
Browse files

kernel: bump 4.9 to 4.9.153

Refreshed all patches.

Compile-tested on: ar7
Runtime-tested on: none

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  • Loading branch information...
xback committed Jan 28, 2019
1 parent aa95bdd commit 662b92614699164396aa38b18f4510333ba64f1d
@@ -3,12 +3,12 @@
LINUX_RELEASE?=1

LINUX_VERSION-3.18 = .133
LINUX_VERSION-4.9 = .152
LINUX_VERSION-4.9 = .153
LINUX_VERSION-4.14 = .95
LINUX_VERSION-4.19 = .16

LINUX_KERNEL_HASH-3.18.133 = 3ec7f47365a8a050e629a5016e90e38a800e840c844901c979e9e796f8dc6711
LINUX_KERNEL_HASH-4.9.152 = 90e47b85c09af47eefafe851685ee731538f640b0650a6a9cfa0234436708e39
LINUX_KERNEL_HASH-4.9.153 = 9066929ec2550794ae107350a5f3c5b648438aa915cfc62bac5b7a54b9d7731a
LINUX_KERNEL_HASH-4.14.95 = ce6729e3fca312520e3cb4f27993852dbb019d94c59c0b35cedab571f9cb58e4
LINUX_KERNEL_HASH-4.19.16 = d8a088381fe3e7e5484c060dabcdda4b053ef7114f91cfd56db003a89bb11bdf

@@ -46,7 +46,7 @@

config ATH25
bool "Atheros AR231x/AR531x SoC support"
@@ -1005,6 +1005,7 @@ config MIPS_PARAVIRT
@@ -1008,6 +1008,7 @@ config MIPS_PARAVIRT
endchoice

source "arch/mips/alchemy/Kconfig"
@@ -55,7 +55,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
rwlock_t sk_callback_lock;
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2478,6 +2478,7 @@ void sock_init_data(struct socket *sock,
@@ -2479,6 +2479,7 @@ void sock_init_data(struct socket *sock,

sk->sk_max_pacing_rate = ~0U;
sk->sk_pacing_rate = ~0U;
@@ -1040,7 +1040,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
writel(irq->mask, adpt->base + EMAC_INT_MASK);
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7576,7 +7576,7 @@ static int rtl8169_poll(struct napi_stru
@@ -7578,7 +7578,7 @@ static int rtl8169_poll(struct napi_stru
}

if (work_done < budget) {
@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1156,6 +1156,10 @@ config SYNC_R4K
@@ -1159,6 +1159,10 @@ config SYNC_R4K
config MIPS_MACHINE
def_bool n

@@ -41,7 +41,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
obj-$(CONFIG_PROC_FS) += net-procfs.o
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1457,9 +1457,11 @@ void sk_destruct(struct sock *sk)
@@ -1458,9 +1458,11 @@ void sk_destruct(struct sock *sk)

static void __sk_free(struct sock *sk)
{
@@ -328,7 +328,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3087,6 +3087,8 @@ static __net_initdata struct pernet_oper
@@ -3088,6 +3088,8 @@ static __net_initdata struct pernet_oper

static int __init proto_init(void)
{
@@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1065,9 +1065,6 @@ config FW_ARC
@@ -1068,9 +1068,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool

@@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool

@@ -2964,6 +2961,18 @@ choice
@@ -2967,6 +2964,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice

@@ -24,7 +24,7 @@ v2: incorporated changes suggested by Jonas Gorski

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2888,6 +2888,20 @@ config MIPS_O32_FP64_SUPPORT
@@ -2891,6 +2891,20 @@ config MIPS_O32_FP64_SUPPORT

If unsure, say N.

@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
select HAVE_PCSPKR_PLATFORM
select IRQ_MIPS_CPU
select I8253
@@ -1126,6 +1128,9 @@ config DMA_NONCOHERENT
@@ -1129,6 +1131,9 @@ config DMA_NONCOHERENT
bool
select NEED_DMA_MAP_STATE

@@ -40,15 +40,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
config NEED_DMA_MAP_STATE
bool

@@ -1650,6 +1655,7 @@ config CPU_R10000
@@ -1653,6 +1658,7 @@ config CPU_R10000
select CPU_SUPPORTS_64BIT_KERNEL
select CPU_SUPPORTS_HIGHMEM
select CPU_SUPPORTS_HUGEPAGES
+ select DMA_UNMAP_POST_FLUSH
help
MIPS Technologies R10000-series processors.

@@ -1895,9 +1901,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
@@ -1898,9 +1904,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
bool

config SYS_HAS_CPU_MIPS32_R5
@@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
bool

config SYS_HAS_CPU_MIPS64_R1
@@ -1907,6 +1915,7 @@ config SYS_HAS_CPU_MIPS64_R2
@@ -1910,6 +1918,7 @@ config SYS_HAS_CPU_MIPS64_R2
bool

config SYS_HAS_CPU_MIPS64_R6
@@ -244,7 +244,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
+}
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -370,14 +370,41 @@ static int __init init_jffs2_fs(void)
@@ -371,14 +371,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);

@@ -18,15 +18,15 @@
uart->capabilities = up->capabilities;
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2240,6 +2240,7 @@ uart_report_port(struct uart_driver *drv
@@ -2250,6 +2250,7 @@ uart_report_port(struct uart_driver *drv
snprintf(address, sizeof(address),
"I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
break;
+ case UPIO_MEM_DELAY:
case UPIO_MEM:
case UPIO_MEM16:
case UPIO_MEM32:
@@ -2904,6 +2905,7 @@ int uart_match_port(struct uart_port *po
@@ -2914,6 +2915,7 @@ int uart_match_port(struct uart_port *po
case UPIO_HUB6:
return (port1->iobase == port2->iobase) &&
(port1->hub6 == port2->hub6);

0 comments on commit 662b926

Please sign in to comment.
You can’t perform that action at this time.