linux-kernel - [ANNOUNCE] 6.1.120-rt47

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <173566540925.1432029.4935545966181953250@demetrius>
Date: Tue, 31 Dec 2024 17:16:49 -0000
From: Clark Williams <williams@...hat.com>
To: LKML <linux-kernel@...r.kernel.org>,linux-rt-users <linux-rt-users@...r.kernel.org>,Steven Rostedt <rostedt@...dmis.org>,Thomas Gleixner <tglx@...utronix.de>,Carsten Emde <C.Emde@...dl.org>,John Kacur <jkacur@...hat.com>,Sebastian Andrzej Siewior <bigeasy@...utronix.de>,Daniel Wagner <daniel.wagner@...e.com>,Tom Zanussi <tom.zanussi@...ux.intel.com>,Clark Williams <williams@...hat.com>,Pavel Machek <pavel@...x.de>,Joseph Salisbury <joseph.salisbury@...cle.com>,Luis Claudio R. Goncalves <lgoncalv@...hat.com>
Subject: [ANNOUNCE] 6.1.120-rt47

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