diff options
| author | John Audia <graysky@archlinux.us> | 2020-12-21 10:06:01 -0500 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-12-22 19:11:50 +0100 |
| commit | a282a04538ac9e41d79da1ea3f30049ffce15a03 (patch) | |
| tree | df689c1afd4702715a67d494a32e9bda59e44e9f /target/linux/ath79 | |
| parent | 3aeaef6e569fde026058529720057dfea7974b6e (diff) | |
| download | upstream-a282a04538ac9e41d79da1ea3f30049ffce15a03.tar.gz upstream-a282a04538ac9e41d79da1ea3f30049ffce15a03.tar.bz2 upstream-a282a04538ac9e41d79da1ea3f30049ffce15a03.zip | |
kernel: bump 5.4 to 5.4.85
All modifications made by update_kernel.sh run in a fresh clone
without any existing toolchains.
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ath79')
| -rw-r--r-- | target/linux/ath79/patches-5.4/450-fix-block-protection-clearing.patch | 6 | ||||
| -rw-r--r-- | target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ath79/patches-5.4/450-fix-block-protection-clearing.patch b/target/linux/ath79/patches-5.4/450-fix-block-protection-clearing.patch index a7ed62302d..dc76161892 100644 --- a/target/linux/ath79/patches-5.4/450-fix-block-protection-clearing.patch +++ b/target/linux/ath79/patches-5.4/450-fix-block-protection-clearing.patch @@ -17,12 +17,12 @@ Signed-off-by: Nick Hainke <vincent@systemli.org> --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1981,7 +1981,7 @@ static int sr2_bit7_quad_enable(struct s +@@ -1985,7 +1985,7 @@ static int sr2_bit7_quad_enable(struct s static int spi_nor_clear_sr_bp(struct spi_nor *nor) { int ret; - u8 mask = SR_BP2 | SR_BP1 | SR_BP0; + u8 mask = SR_TB | SR_BP2 | SR_BP1 | SR_BP0; - ret = read_sr(nor); - if (ret < 0) { + if (nor->flags & SNOR_F_HAS_4BIT_BP) + mask |= SR_BP3; diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch index 16317114dc..923eac92f8 100644 --- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch @@ -706,7 +706,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3971,14 +3971,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3972,14 +3972,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); |