diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2018-06-04 20:06:00 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-06-05 22:54:00 +0300 |
| commit | e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e (patch) | |
| tree | 804a13ddc9ccf75e3f0ae38102ddbf950806ea79 /target/linux/ath79 | |
| parent | 7590c3c58f5e9d580c86da10473d1d29a2f081c9 (diff) | |
| download | upstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.tar.gz upstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.tar.bz2 upstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.zip | |
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 <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/ath79')
| -rw-r--r-- | target/linux/ath79/patches-4.14/0009-MIPS-ath79-add-lots-of-missing-registers.patch | 10 | ||||
| -rw-r--r-- | target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/ath79/patches-4.14/0009-MIPS-ath79-add-lots-of-missing-registers.patch b/target/linux/ath79/patches-4.14/0009-MIPS-ath79-add-lots-of-missing-registers.patch index 5963ee8991..d1755394fa 100644 --- a/target/linux/ath79/patches-4.14/0009-MIPS-ath79-add-lots-of-missing-registers.patch +++ b/target/linux/ath79/patches-4.14/0009-MIPS-ath79-add-lots-of-missing-registers.patch @@ -156,7 +156,7 @@ Signed-off-by: John Crispin <john@phrozen.org> /* * PLL block */ -@@ -166,8 +260,14 @@ +@@ -166,9 +260,15 @@ #define AR71XX_AHB_DIV_SHIFT 20 #define AR71XX_AHB_DIV_MASK 0x7 @@ -164,14 +164,14 @@ Signed-off-by: John Crispin <john@phrozen.org> +#define AR71XX_ETH1_PLL_SHIFT 19 + #define AR724X_PLL_REG_CPU_CONFIG 0x00 --#define AR724X_PLL_REG_PCIE_CONFIG 0x18 -+#define AR724X_PLL_REG_PCIE_CONFIG 0x10 -+ + #define AR724X_PLL_REG_PCIE_CONFIG 0x10 + +#define AR724X_PLL_REG_PCIE_CONFIG_PPL_BYPASS BIT(16) +#define AR724X_PLL_REG_PCIE_CONFIG_PPL_RESET BIT(25) - ++ #define AR724X_PLL_FB_SHIFT 0 #define AR724X_PLL_FB_MASK 0x3ff + #define AR724X_PLL_REF_DIV_SHIFT 10 @@ -178,6 +278,8 @@ #define AR724X_DDR_DIV_SHIFT 22 #define AR724X_DDR_DIV_MASK 0x3 diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index e2ca932af0..9897679a62 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -724,7 +724,7 @@ | TCPOLEN_TIMESTAMP)) --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c -@@ -187,8 +187,8 @@ int xfrm_parse_spi(struct sk_buff *skb, +@@ -193,8 +193,8 @@ int xfrm_parse_spi(struct sk_buff *skb, if (!pskb_may_pull(skb, hlen)) return -EINVAL; @@ -737,7 +737,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3842,14 +3842,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3844,14 +3844,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); |