From 75e63c249411773613f3f201bea9245623d9f57a Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 15 Sep 2016 21:16:34 +0200 Subject: kernel: update kernel 3.18 to version 3.18.43 Refresh patches for all targets supporting 3.18 and not marked broken. Compile-tested on all targets using 3.18 and not marked broken. Changes to generic/610-netfilter_match_bypass_default_checks.patch based on 84d489f64f3b382d5544e342f66d8806e94e85d3. Signed-off-by: Stijn Tintel --- target/linux/ixp4xx/patches-3.18/020-gateworks_i2c_pld.patch | 2 +- target/linux/ixp4xx/patches-3.18/090-increase_entropy_pools.patch | 2 +- target/linux/ixp4xx/patches-3.18/160-delayed_uart_io.patch | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/ixp4xx') diff --git a/target/linux/ixp4xx/patches-3.18/020-gateworks_i2c_pld.patch b/target/linux/ixp4xx/patches-3.18/020-gateworks_i2c_pld.patch index 4732d163a4..0c8c29711a 100644 --- a/target/linux/ixp4xx/patches-3.18/020-gateworks_i2c_pld.patch +++ b/target/linux/ixp4xx/patches-3.18/020-gateworks_i2c_pld.patch @@ -1,6 +1,6 @@ --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig -@@ -794,6 +794,14 @@ config GPIO_RDC321X +@@ -795,6 +795,14 @@ config GPIO_RDC321X Support for the RDC R321x SoC GPIOs over southbridge PCI configuration space. diff --git a/target/linux/ixp4xx/patches-3.18/090-increase_entropy_pools.patch b/target/linux/ixp4xx/patches-3.18/090-increase_entropy_pools.patch index 285505c7f8..3eea75b519 100644 --- a/target/linux/ixp4xx/patches-3.18/090-increase_entropy_pools.patch +++ b/target/linux/ixp4xx/patches-3.18/090-increase_entropy_pools.patch @@ -1,6 +1,6 @@ --- a/drivers/char/random.c +++ b/drivers/char/random.c -@@ -285,11 +285,11 @@ +@@ -275,11 +275,11 @@ /* * Configuration information */ diff --git a/target/linux/ixp4xx/patches-3.18/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-3.18/160-delayed_uart_io.patch index 54dc905468..4207e67a6f 100644 --- a/target/linux/ixp4xx/patches-3.18/160-delayed_uart_io.patch +++ b/target/linux/ixp4xx/patches-3.18/160-delayed_uart_io.patch @@ -41,7 +41,7 @@ case UPIO_AU: p->serial_out(p, offset, value); p->serial_in(p, UART_LCR); /* safe, no side-effects */ -@@ -2655,6 +2675,7 @@ static int serial8250_request_std_resour +@@ -2649,6 +2669,7 @@ static int serial8250_request_std_resour case UPIO_TSI: case UPIO_MEM32: case UPIO_MEM: @@ -49,7 +49,7 @@ if (!port->mapbase) break; -@@ -2691,6 +2712,7 @@ static void serial8250_release_std_resou +@@ -2685,6 +2706,7 @@ static void serial8250_release_std_resou case UPIO_TSI: case UPIO_MEM32: case UPIO_MEM: @@ -57,7 +57,7 @@ if (!port->mapbase) break; -@@ -3424,6 +3446,7 @@ static int serial8250_probe(struct platf +@@ -3418,6 +3440,7 @@ static int serial8250_probe(struct platf uart.port.set_termios = p->set_termios; uart.port.pm = p->pm; uart.port.dev = &dev->dev; @@ -65,7 +65,7 @@ uart.port.irqflags |= irqflag; ret = serial8250_register_8250_port(&uart); if (ret < 0) { -@@ -3580,6 +3603,7 @@ int serial8250_register_8250_port(struct +@@ -3574,6 +3597,7 @@ int serial8250_register_8250_port(struct uart->port.flags = up->port.flags | UPF_BOOT_AUTOCONF; uart->bugs = up->bugs; uart->port.mapbase = up->port.mapbase; -- cgit v1.2.3