aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-12-08 08:12:51 -0500
committerNick Hainke <vincent@systemli.org>2023-12-11 17:39:57 +0100
commit303ff26dc79bc5323af595d7dae491f091e0e7e1 (patch)
tree925f4b6d16030df0e6c5453798712933e355f590
parent9ed26a48d9c4617a20851968257700afcd149a28 (diff)
kernel: bump 5.15 to 5.15.142
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.142 All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
-rw-r--r--include/kernel-5.154
-rw-r--r--target/linux/layerscape/patches-5.15/704-dpaa2-eth-do-not-hold-rtnl_lock.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-5.15 b/include/kernel-5.15
index 809cec3065..12c8863579 100644
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .141
-LINUX_KERNEL_HASH-5.15.141 = 936d6ac65c692a986b4bde34b7f3d7ad90f7f86f19e4ef320e008d40f07e2cfa
+LINUX_VERSION-5.15 = .142
+LINUX_KERNEL_HASH-5.15.142 = 8d76c95277dc5ab0a6cd0069432af2ceb759d0ac2b6f5401330d390196095676
diff --git a/target/linux/layerscape/patches-5.15/704-dpaa2-eth-do-not-hold-rtnl_lock.patch b/target/linux/layerscape/patches-5.15/704-dpaa2-eth-do-not-hold-rtnl_lock.patch
index c7d16e5c4c..bff41aa2a4 100644
--- a/target/linux/layerscape/patches-5.15/704-dpaa2-eth-do-not-hold-rtnl_lock.patch
+++ b/target/linux/layerscape/patches-5.15/704-dpaa2-eth-do-not-hold-rtnl_lock.patch
@@ -27,7 +27,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -4217,12 +4217,10 @@ static irqreturn_t dpni_irq0_handler_thr
+@@ -4215,12 +4215,10 @@ static irqreturn_t dpni_irq0_handler_thr
dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
dpaa2_eth_update_tx_fqids(priv);