summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2022-10-27 09:42:07 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2022-10-27 09:42:07 +0200
commit3ead6776bffda4a0d853bea544572b03574a06ca (patch)
tree84e7fdb5446e2a74fcc24c093d5f11fb366aa953
parenta62fa8c3e7d326f36983d81fba1b88140e0f8071 (diff)
downloadlinux-rt-3ead6776bffda4a0d853bea544572b03574a06ca.tar.gz
[ANNOUNCE] v6.0.5-rt14v6.0.5-rt14-patches
Dear RT folks! I'm pleased to announce the v6.0.5-rt14 patch set. Changes since v6.0.5-rt13: - Replace deprecated API in the Xilinx AXI Ethernet driver so that it compiles again. Reported by David Runge. Known issues - Valentin Schneider reported a few splats on ARM64, see https://lkml.kernel.org/r/20210810134127.1394269-1-valentin.schneider@arm.com The delta patch against v6.0.5-rt13 is appended below and can be found here: https://cdn.kernel.org/pub/linux/kernel/projects/rt/6.0/incr/patch-6.0.5-rt13-rt14.patch.xz You can get this release via the git tree at: git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git v6.0.5-rt14 The RT patch against v6.0.5 can be found here: https://cdn.kernel.org/pub/linux/kernel/projects/rt/6.0/older/patch-6.0.5-rt14.patch.xz The split quilt queue is available at: https://cdn.kernel.org/pub/linux/kernel/projects/rt/6.0/older/patches-6.0.5-rt14.tar.xz Sebastian Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r--patches/0002-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch (renamed from patches/0002-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch)29
-rw-r--r--patches/0003-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-n.patch (renamed from patches/0003-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch)3
-rw-r--r--patches/Add_localversion_for_-RT_release.patch2
-rw-r--r--patches/series4
4 files changed, 32 insertions, 6 deletions
diff --git a/patches/0002-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch b/patches/0002-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch
index 3cd9ab9fad7b..769140a6099b 100644
--- a/patches/0002-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
+++ b/patches/0002-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch
@@ -1,6 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 25 Aug 2022 16:15:44 +0200
-Subject: [PATCH 2/4] net: Remove the obsolte u64_stats_fetch_*_irq() users (part one).
+Subject: [PATCH 2/4] net: Remove the obsolte u64_stats_fetch_*_irq() users
+ (drivers).
Now that the 32bit UP oddity is gone and 32bit uses always a sequence
count, there is no need for the fetch_irq() variants anymore.
@@ -57,6 +58,7 @@ Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 4 +-
drivers/net/ethernet/ti/netcp_core.c | 8 ++--
drivers/net/ethernet/via/via-rhine.c | 8 ++--
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 8 ++--
drivers/net/hyperv/netvsc_drv.c | 32 +++++++++----------
drivers/net/ifb.c | 12 +++----
drivers/net/ipvlan/ipvlan_main.c | 4 +-
@@ -73,7 +75,7 @@ Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
drivers/net/vxlan/vxlan_vnifilter.c | 4 +-
drivers/net/wwan/mhi_wwan_mbim.c | 8 ++--
drivers/net/xen-netfront.c | 8 ++--
- 62 files changed, 270 insertions(+), 270 deletions(-)
+ 63 files changed, 274 insertions(+), 274 deletions(-)
--- a/drivers/net/ethernet/alacritech/slic.h
+++ b/drivers/net/ethernet/alacritech/slic.h
@@ -1495,6 +1497,29 @@ Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
}
static void rhine_set_rx_mode(struct net_device *dev)
+--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
++++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+@@ -1305,16 +1305,16 @@ axienet_get_stats64(struct net_device *d
+ netdev_stats_to_stats64(stats, &dev->stats);
+
+ do {
+- start = u64_stats_fetch_begin_irq(&lp->rx_stat_sync);
++ start = u64_stats_fetch_begin(&lp->rx_stat_sync);
+ stats->rx_packets = u64_stats_read(&lp->rx_packets);
+ stats->rx_bytes = u64_stats_read(&lp->rx_bytes);
+- } while (u64_stats_fetch_retry_irq(&lp->rx_stat_sync, start));
++ } while (u64_stats_fetch_retry(&lp->rx_stat_sync, start));
+
+ do {
+- start = u64_stats_fetch_begin_irq(&lp->tx_stat_sync);
++ start = u64_stats_fetch_begin(&lp->tx_stat_sync);
+ stats->tx_packets = u64_stats_read(&lp->tx_packets);
+ stats->tx_bytes = u64_stats_read(&lp->tx_bytes);
+- } while (u64_stats_fetch_retry_irq(&lp->tx_stat_sync, start));
++ } while (u64_stats_fetch_retry(&lp->tx_stat_sync, start));
+ }
+
+ static const struct net_device_ops axienet_netdev_ops = {
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -1264,12 +1264,12 @@ static void netvsc_get_vf_stats(struct n
diff --git a/patches/0003-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch b/patches/0003-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-n.patch
index 32eb23a2fc72..f09f1760d4a4 100644
--- a/patches/0003-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
+++ b/patches/0003-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-n.patch
@@ -1,6 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 25 Aug 2022 16:17:37 +0200
-Subject: [PATCH 3/4] net: Remove the obsolte u64_stats_fetch_*_irq() users (part two).
+Subject: [PATCH 3/4] net: Remove the obsolte u64_stats_fetch_*_irq() users
+ (net).
Now that the 32bit UP oddity is gone and 32bit uses always a sequence
count, there is no need for the fetch_irq() variants anymore.
diff --git a/patches/Add_localversion_for_-RT_release.patch b/patches/Add_localversion_for_-RT_release.patch
index 7b0058411028..a3ac9f9ca746 100644
--- a/patches/Add_localversion_for_-RT_release.patch
+++ b/patches/Add_localversion_for_-RT_release.patch
@@ -15,4 +15,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- /dev/null
+++ b/localversion-rt
@@ -0,0 +1 @@
-+-rt13
++-rt14
diff --git a/patches/series b/patches/series
index f607d9f5625d..82479c262422 100644
--- a/patches/series
+++ b/patches/series
@@ -41,8 +41,8 @@ sched-Consider-task_struct-saved_state-in-wait_task_.patch
0008-u64_stats-Streamline-the-implementation.patch
# Wait until after the previous patch is upstream.
0001-spi-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
-0002-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
-0003-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
+0002-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch
+0003-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-n.patch
0004-bpf-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
# Wait until previous four are upstream.
u64_stat-Remove-the-obsolete-fetch_irq-variants.patch