diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-05-09 09:41:30 +0100 |
|---|---|---|
| committer | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-05-09 20:49:50 +0100 |
| commit | d9a063c3967c72773616cf5eadd4f978b9724c50 (patch) | |
| tree | e038cba587dad6c6de629c44278c7dcd62f7d3a3 /target/linux/ath79 | |
| parent | 634a45cf1d7e85d633314910bc030d40dbe476bb (diff) | |
| download | upstream-d9a063c3967c72773616cf5eadd4f978b9724c50.tar.gz upstream-d9a063c3967c72773616cf5eadd4f978b9724c50.tar.bz2 upstream-d9a063c3967c72773616cf5eadd4f978b9724c50.zip | |
kernel: bump 5.15 to 5.15.38
Deleted (upstreamed):
mediatek/patches-5.15/120-10-v5.18-mtd-nand-fix-ecc-parameters-for-mt7622.patch [1]
Other patches automatically rebased.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.38&id=3ec920d755ae69c201b358e8d8e96c32f51145d8
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/ath79')
| -rw-r--r-- | target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch index 260cf4f45a..436d6e0907 100644 --- a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch @@ -305,7 +305,7 @@ list_for_each_entry(p, head, list) { --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -612,48 +612,53 @@ static void tcp_options_write(__be32 *pt +@@ -613,48 +613,53 @@ static void tcp_options_write(__be32 *pt u16 options = opts->options; /* mungable copy */ if (unlikely(OPTION_MD5 & options)) { @@ -382,7 +382,7 @@ } if (unlikely(opts->num_sack_blocks)) { -@@ -661,16 +666,17 @@ static void tcp_options_write(__be32 *pt +@@ -662,16 +667,17 @@ static void tcp_options_write(__be32 *pt tp->duplicate_sack : tp->selective_acks; int this_sack; @@ -406,7 +406,7 @@ } tp->rx_opt.dsack = 0; -@@ -683,13 +689,14 @@ static void tcp_options_write(__be32 *pt +@@ -684,13 +690,14 @@ static void tcp_options_write(__be32 *pt if (foc->exp) { len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len; @@ -706,7 +706,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4129,14 +4129,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -4130,14 +4130,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); |