From e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Mon, 4 Jun 2018 20:06:00 +0300 Subject: kernel: bump 4.14 to 4.14.48 Remove upstreamed patches: generic/pending/101-clocksource-mips-gic-timer-fix-clocksource-counter-w.patch generic/pending/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch generic/pending/182-net-qmi_wwan-add-BroadMobi-BM806U-2020-2033.patch lantiq/0025-MIPS-lantiq-gphy-Remove-reboot-remove-reset-asserts.patch Update patches that no longer apply: generic/pending/811-pci_disable_usb_common_quirks.patch ath79/0009-MIPS-ath79-add-lots-of-missing-registers.patch Fixes CVE-2018-6412. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel --- target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch | 7 ------- 1 file changed, 7 deletions(-) (limited to 'target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch') diff --git a/target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch b/target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch index 6dd3b056cf..ad0df9199b 100644 --- a/target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch +++ b/target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch @@ -9,8 +9,6 @@ Signed-off-by: Daniel Golle include/dt-bindings/clock/oxsemi,ox820.h | 32 +++++++++++------------- 2 files changed, 14 insertions(+), 20 deletions(-) -diff --git a/drivers/clk/clk-oxnas.c b/drivers/clk/clk-oxnas.c -index e51e0023fc6e..da6af71649de 100644 --- a/drivers/clk/clk-oxnas.c +++ b/drivers/clk/clk-oxnas.c @@ -40,8 +40,6 @@ struct oxnas_stdclk_data { @@ -22,8 +20,6 @@ index e51e0023fc6e..da6af71649de 100644 }; /* Regmap offsets */ -diff --git a/include/dt-bindings/clock/oxsemi,ox820.h b/include/dt-bindings/clock/oxsemi,ox820.h -index f661ecc8d760..35b44ca1b104 100644 --- a/include/dt-bindings/clock/oxsemi,ox820.h +++ b/include/dt-bindings/clock/oxsemi,ox820.h @@ -17,24 +17,20 @@ @@ -65,6 +61,3 @@ index f661ecc8d760..35b44ca1b104 100644 +#define CLK_820_USBDEV 13 #endif /* DT_CLOCK_OXSEMI_OX820_H */ --- -2.17.1 - -- cgit v1.2.3