Skip to content

Commit 319dc6c

Browse files
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: bump 5.10 to 5.10.134 (coolsnowwolf#9868)
2 parents 99499f8 + a735627 commit 319dc6c

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .133
2-
LINUX_KERNEL_HASH-5.10.133 = 3b5c4c7d5bca720c11f1024c9aa00ac04397b6c7de37fd4170444077c723280e
1+
LINUX_VERSION-5.10 = .134
2+
LINUX_KERNEL_HASH-5.10.134 = ec3513acdf033dd8f8ac2545cd1bb826b0669e151185e5f70408a5c9fe273269

target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@
706706
EXPORT_SYMBOL(xfrm_parse_spi);
707707
--- a/net/ipv4/tcp_input.c
708708
+++ b/net/ipv4/tcp_input.c
709-
@@ -4087,14 +4087,16 @@ static bool tcp_parse_aligned_timestamp(
709+
@@ -4092,14 +4092,16 @@ static bool tcp_parse_aligned_timestamp(
710710
{
711711
const __be32 *ptr = (const __be32 *)(th + 1);
712712

target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <[email protected]>
13601360
int irq;
13611361
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
13621362
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
1363-
@@ -4988,7 +4988,7 @@ int stmmac_dvr_probe(struct device *devi
1363+
@@ -4987,7 +4987,7 @@ int stmmac_dvr_probe(struct device *devi
13641364
priv->wol_irq = res->wol_irq;
13651365
priv->lpi_irq = res->lpi_irq;
13661366

target/linux/ramips/patches-5.10/804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
22
+++ b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
3-
@@ -354,7 +354,7 @@ static int rt2880_pinmux_probe(struct pl
3+
@@ -356,7 +356,7 @@ static int rt2880_pinmux_probe(struct pl
44
if (!of_device_is_available(np))
55
continue;
66

0 commit comments

Comments
 (0)