[ANNOUNCE] 6.1.120-rt47
From: Clark Williams
Date: Tue Dec 31 2024 - 12:21:56 EST
Hello RT-list!
I'm pleased to announce the 6.1.120-rt47 stable release.
Well, not so much pleased as embarrassed :) This is a fix to a mistake
I made when doing conflict resolution for merging the 6.1.120 kernel
into the v6.1-rt stable tree. I picked the wrong diff hunk for the file
drivers/net/vrf.c, which caused a reference to an invalid structure name.
I compounded this mistake by skipping an 'allmodconfig' build, so shipped
a borken vrf driver.
Many thanks to Ranjan Dutta for pointing this out!
You can get this release via the git tree at:
git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git
branch: v6.1-rt
Head SHA1: 029f397b09cddc99b8748dc23a4c3d5a5cb1c85c
Or to build 6.1.120-rt47 directly, the following patches should be applied:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.120.xz
https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/patch-6.1.120-rt47.patch.xz
Enjoy!
Clark
Changes from v6.1.120-rt46:
---
Clark Williams (2):
net: fix mis-merge from stable in drivers/net/vrf.c
Linux 6.1.120-rt47
---
drivers/net/vrf.c | 2 +-
localversion-rt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index c3e5fb98cf7f..164ffe1919de 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -154,7 +154,7 @@ static void vrf_get_stats64(struct net_device *dev,
tpkts = dstats->tx_packets;
tdrops = dstats->tx_drops;
rbytes = dstats->rx_bytes;
- rpkts = dstats->rx_pkts;
+ rpkts = dstats->rx_packets;
} while (u64_stats_fetch_retry(&dstats->syncp, start));
stats->tx_bytes += tbytes;
stats->tx_packets += tpkts;
diff --git a/localversion-rt b/localversion-rt
index 272158183778..8a777ac42aab 100644
--- a/localversion-rt
+++ b/localversion-rt
@@ -1 +1 @@
--rt46
+-rt47