Skip to content
Permalink
Browse files

kernel: bump 4.14 to 4.14.96

Refreshed all patches.

Remove upstreamed patches:
- 142-jffs2-Fix-use-of-uninitialized-delayed_work-lockdep-.patch

Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  • Loading branch information...
xback committed Jan 28, 2019
1 parent 662b926 commit 3662157d8beda32d95fdc039da0b8114c0c2bb7b
Showing with 28 additions and 116 deletions.
  1. +2 −2 include/kernel-version.mk
  2. +1 −1 target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch
  3. +1 −1 target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
  4. +1 −1 target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch
  5. +1 −1 target/linux/generic/backport-4.14/420-enable-CONFIG_MMC_SDHCI_IO_ACCESSORS.patch
  6. +1 −1 target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch
  7. +1 −1 target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
  8. +1 −1 target/linux/generic/hack-4.14/902-debloat_proc.patch
  9. +0 −62 target/linux/generic/pending-4.14/142-jffs2-Fix-use-of-uninitialized-delayed_work-lockdep-.patch
  10. +2 −2 target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
  11. +1 −1 target/linux/generic/pending-4.14/304-mips_disable_fpu.patch
  12. +4 −4 target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
  13. +1 −1 target/linux/lantiq/patches-4.14/0152-lantiq-VPE.patch
  14. +4 −8 target/linux/mpc85xx/patches-4.14/106-powerpc-85xx-panda-support.patch
  15. +1 −1 target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
  16. +1 −1 target/linux/ramips/patches-4.14/0051-serial-add-ugly-custom-baud-rate-hack.patch
  17. +1 −8 target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch
  18. +2 −7 target/linux/sunxi/patches-4.14/080-arm64-allwinner-a64-add-SPI-nodes.patch
  19. +1 −6 target/linux/sunxi/patches-4.14/081-arm64-dts-allwinner-sun50i-a64-Add-spi-flash-node-fo.patch
  20. +1 −6 target/linux/sunxi/patches-4.14/400-arm64-allwinner-a64-sopine-Add-Sopine-flash-partitio.patch
@@ -4,12 +4,12 @@ LINUX_RELEASE?=1

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

LINUX_KERNEL_HASH-3.18.133 = 3ec7f47365a8a050e629a5016e90e38a800e840c844901c979e9e796f8dc6711
LINUX_KERNEL_HASH-4.9.153 = 9066929ec2550794ae107350a5f3c5b648438aa915cfc62bac5b7a54b9d7731a
LINUX_KERNEL_HASH-4.14.95 = ce6729e3fca312520e3cb4f27993852dbb019d94c59c0b35cedab571f9cb58e4
LINUX_KERNEL_HASH-4.14.96 = 110daeae1a416b7e0ec8dce5e86d67552deeb4567f696c3869389be239f0ecb5
LINUX_KERNEL_HASH-4.19.16 = d8a088381fe3e7e5484c060dabcdda4b053ef7114f91cfd56db003a89bb11bdf

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
@@ -10,7 +10,7 @@

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1152,6 +1152,9 @@ config MIPS_MSC
@@ -1155,6 +1155,9 @@ config MIPS_MSC
config MIPS_NILE4
bool

@@ -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
@@ -2742,6 +2742,7 @@ void sock_init_data(struct socket *sock,
@@ -2743,6 +2743,7 @@ void sock_init_data(struct socket *sock,

sk->sk_max_pacing_rate = ~0U;
sk->sk_pacing_rate = ~0U;
@@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -834,6 +834,7 @@ static void clusterip_net_exit(struct ne
@@ -835,6 +835,7 @@ static void clusterip_net_exit(struct ne
cn->procdir = NULL;
#endif
nf_unregister_net_hook(net, &cip_arp_ops);
@@ -13,7 +13,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>

--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -420,6 +420,7 @@ config MMC_SDHCI_MSM
@@ -429,6 +429,7 @@ config MMC_SDHCI_MSM
tristate "Qualcomm SDHCI Controller Support"
depends on ARCH_QCOM || (ARM && COMPILE_TEST)
depends on MMC_SDHCI_PLTFM
@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

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

@@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
{
struct dst_entry *dst = __sk_dst_get(sk);
@@ -1595,9 +1607,11 @@ void sk_destruct(struct sock *sk)
@@ -1596,9 +1608,11 @@ void sk_destruct(struct sock *sk)

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

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

static int __init proto_init(void)
{

This file was deleted.

@@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1067,9 +1067,6 @@ config FW_ARC
@@ -1070,9 +1070,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

@@ -2967,6 +2964,18 @@ choice
@@ -2970,6 +2967,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
@@ -2891,6 +2891,20 @@ config MIPS_O32_FP64_SUPPORT
@@ -2894,6 +2894,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
@@ -1128,6 +1130,9 @@ config DMA_NONCOHERENT
@@ -1131,6 +1133,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

@@ -1652,6 +1657,7 @@ config CPU_R10000
@@ -1655,6 +1660,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.

@@ -1900,9 +1906,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
@@ -1903,9 +1909,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
@@ -1912,6 +1920,7 @@ config SYS_HAS_CPU_MIPS64_R2
@@ -1915,6 +1923,7 @@ config SYS_HAS_CPU_MIPS64_R2
bool

config SYS_HAS_CPU_MIPS64_R6
@@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2324,6 +2324,12 @@ config MIPS_VPE_LOADER
@@ -2327,6 +2327,12 @@ config MIPS_VPE_LOADER
Includes a loader for loading an elf relocatable object
onto another VPE and running it.

@@ -1,7 +1,5 @@
Index: linux-4.14.82/arch/powerpc/platforms/85xx/Kconfig
===================================================================
--- linux-4.14.82.orig/arch/powerpc/platforms/85xx/Kconfig
+++ linux-4.14.82/arch/powerpc/platforms/85xx/Kconfig
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -60,6 +60,17 @@ config HIVEAP_330
This board is a Concurrent Dual-Band wireless access point with a
Freescale P1020 SoC.
@@ -20,10 +18,8 @@ Index: linux-4.14.82/arch/powerpc/platforms/85xx/Kconfig
config MPC8540_ADS
bool "Freescale MPC8540 ADS"
select DEFAULT_UIMAGE
Index: linux-4.14.82/arch/powerpc/platforms/85xx/Makefile
===================================================================
--- linux-4.14.82.orig/arch/powerpc/platforms/85xx/Makefile
+++ linux-4.14.82/arch/powerpc/platforms/85xx/Makefile
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_P1010_RDB) += p1010rdb.o
obj-$(CONFIG_P1022_DS) += p1022_ds.o
obj-$(CONFIG_P1022_RDK) += p1022_rdk.o
@@ -25,7 +25,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>

--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -899,3 +899,5 @@ config MMC_SDHCI_XENON
@@ -900,3 +900,5 @@ config MMC_SDHCI_XENON
This selects Marvell Xenon eMMC/SD/SDIO SDHCI.
If you have a controller with this interface, say Y or M here.
If unsure, say N.
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>

--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -418,6 +418,9 @@ uart_get_baud_rate(struct uart_port *por
@@ -428,6 +428,9 @@ uart_get_baud_rate(struct uart_port *por
break;
}

@@ -15,8 +15,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 7 +++++++
2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
index 62dd5baad70e..04fc368d828f 100644
--- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
@@ -2,8 +2,10 @@ Allwinner SoCs Watchdog timer
@@ -32,11 +30,9 @@ index 62dd5baad70e..04fc368d828f 100644
- reg : Specifies base physical address and size of the registers.

Example:
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 64e452a758fa..8401e7f887ff 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -665,5 +665,12 @@
@@ -537,5 +537,12 @@
#address-cells = <1>;
#size-cells = <0>;
};
@@ -49,6 +45,3 @@ index 64e452a758fa..8401e7f887ff 100644
+ };
};
};
--
2.17.1

@@ -19,8 +19,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 41 +++++++++++++++++++
1 file changed, 41 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 8c8db1b057df..20aba7b186aa 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -325,6 +325,16 @@
@@ -40,8 +38,8 @@ index 8c8db1b057df..20aba7b186aa 100644
uart0_pins_a: uart0@0 {
pins = "PB8", "PB9";
function = "uart0";
@@ -449,6 +459,37 @@
#size-cells = <0>;
@@ -470,6 +480,37 @@
};
};

+
@@ -78,6 +76,3 @@ index 8c8db1b057df..20aba7b186aa 100644
gic: interrupt-controller@1c81000 {
compatible = "arm,gic-400";
reg = <0x01c81000 0x1000>,
--
2.17.1

@@ -13,11 +13,9 @@ Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
index 43418bd881d8..b94f93c04acb 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
@@ -66,6 +66,18 @@
@@ -75,6 +75,18 @@
};
};

@@ -36,6 +34,3 @@ index 43418bd881d8..b94f93c04acb 100644
#include "axp803.dtsi"

&reg_aldo2 {
--
2.17.1

@@ -13,11 +13,9 @@ Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
.../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
index 6723b8695e0b..3e879fefe3d5 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
@@ -78,6 +78,28 @@
@@ -84,6 +84,28 @@
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <40000000>;
@@ -46,6 +44,3 @@ index 6723b8695e0b..3e879fefe3d5 100644
};
};

--
2.17.1

0 comments on commit 3662157

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