summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2022-08-29 08:30:02 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2022-08-29 08:30:02 +0200
commit55839df7d295b66d69cb76b2880c9d83f8bfaa96 (patch)
tree168578a1918545f993f61ce9b633e074e105cc04
parent6764e8670cb453b9d3ce4baeafd2ef1e7afbeca7 (diff)
downloadlinux-rt-6.0-rc3-rt5-patches.tar.gz
[ANNOUNCE] v6.0-rc3-rt5v6.0-rc3-rt5-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r--patches/0002-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch10
-rw-r--r--patches/0003-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch2
-rw-r--r--patches/Add_localversion_for_-RT_release.patch2
-rw-r--r--patches/arch_arm64__Add_lazy_preempt_support.patch2
-rw-r--r--patches/drivers_block_zram__Replace_bit_spinlocks_with_rtmutex_for_-rt.patch2
-rw-r--r--patches/net-Avoid-the-IPI-to-free-the.patch4
6 files changed, 11 insertions, 11 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.patch
index 324c9a35eab0..a234c92c7a09 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.patch
@@ -781,7 +781,7 @@ Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
*data += size;
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
-@@ -6280,10 +6280,10 @@ ice_fetch_u64_stats_per_ring(struct u64_
+@@ -6289,10 +6289,10 @@ ice_fetch_u64_stats_per_ring(struct u64_
unsigned int start;
do {
@@ -1169,7 +1169,7 @@ Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
storage->tx_errors = dev->stats.tx_errors;
storage->rx_dropped = dev->stats.rx_dropped;
-@@ -3662,13 +3662,13 @@ static void mtk_get_ethtool_stats(struct
+@@ -3664,13 +3664,13 @@ static void mtk_get_ethtool_stats(struct
do {
data_dst = data;
@@ -1682,7 +1682,7 @@ Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
}
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
-@@ -2828,9 +2828,9 @@ static void get_rx_sc_stats(struct net_d
+@@ -2823,9 +2823,9 @@ static void get_rx_sc_stats(struct net_d
stats = per_cpu_ptr(rx_sc->stats, cpu);
do {
@@ -1694,7 +1694,7 @@ Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
sum->InOctetsValidated += tmp.InOctetsValidated;
sum->InOctetsDecrypted += tmp.InOctetsDecrypted;
-@@ -2909,9 +2909,9 @@ static void get_tx_sc_stats(struct net_d
+@@ -2904,9 +2904,9 @@ static void get_tx_sc_stats(struct net_d
stats = per_cpu_ptr(macsec_priv(dev)->secy.tx_sc.stats, cpu);
do {
@@ -1706,7 +1706,7 @@ Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
sum->OutPktsProtected += tmp.OutPktsProtected;
sum->OutPktsEncrypted += tmp.OutPktsEncrypted;
-@@ -2965,9 +2965,9 @@ static void get_secy_stats(struct net_de
+@@ -2960,9 +2960,9 @@ static void get_secy_stats(struct net_de
stats = per_cpu_ptr(macsec_priv(dev)->stats, cpu);
do {
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.patch
index da2e8b82bef5..32eb23a2fc72 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.patch
@@ -299,7 +299,7 @@ Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
i, (u64)conns, (u64)inpkts,
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -1535,10 +1535,10 @@ static int nft_dump_stats(struct sk_buff
+@@ -1534,10 +1534,10 @@ static int nft_dump_stats(struct sk_buff
for_each_possible_cpu(cpu) {
cpu_stats = per_cpu_ptr(stats, cpu);
do {
diff --git a/patches/Add_localversion_for_-RT_release.patch b/patches/Add_localversion_for_-RT_release.patch
index 41fc0b58e69e..f2d35e0c0528 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 @@
-+-rt4
++-rt5
diff --git a/patches/arch_arm64__Add_lazy_preempt_support.patch b/patches/arch_arm64__Add_lazy_preempt_support.patch
index 06f660ca8861..8be392060694 100644
--- a/patches/arch_arm64__Add_lazy_preempt_support.patch
+++ b/patches/arch_arm64__Add_lazy_preempt_support.patch
@@ -124,7 +124,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
#endif
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
-@@ -1093,7 +1093,7 @@ static void do_signal(struct pt_regs *re
+@@ -1103,7 +1103,7 @@ static void do_signal(struct pt_regs *re
void do_notify_resume(struct pt_regs *regs, unsigned long thread_flags)
{
do {
diff --git a/patches/drivers_block_zram__Replace_bit_spinlocks_with_rtmutex_for_-rt.patch b/patches/drivers_block_zram__Replace_bit_spinlocks_with_rtmutex_for_-rt.patch
index 31e0f249eacd..76da29d9e612 100644
--- a/patches/drivers_block_zram__Replace_bit_spinlocks_with_rtmutex_for_-rt.patch
+++ b/patches/drivers_block_zram__Replace_bit_spinlocks_with_rtmutex_for_-rt.patch
@@ -70,7 +70,7 @@ Link: https://lkml.kernel.org/r/YqIbMuHCPiQk+Ac2@linutronix.de
static inline bool init_done(struct zram *zram)
{
-@@ -1197,6 +1232,7 @@ static bool zram_meta_alloc(struct zram
+@@ -1198,6 +1233,7 @@ static bool zram_meta_alloc(struct zram
if (!huge_class_size)
huge_class_size = zs_huge_class_size(zram->mem_pool);
diff --git a/patches/net-Avoid-the-IPI-to-free-the.patch b/patches/net-Avoid-the-IPI-to-free-the.patch
index ac5ad5ebefa7..81de25b08f89 100644
--- a/patches/net-Avoid-the-IPI-to-free-the.patch
+++ b/patches/net-Avoid-the-IPI-to-free-the.patch
@@ -24,7 +24,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -3142,7 +3142,11 @@ struct softnet_data {
+@@ -3156,7 +3156,11 @@ struct softnet_data {
int defer_count;
int defer_ipi_scheduled;
struct sk_buff *defer_list;
@@ -99,7 +99,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
init_gro_hash(&sd->backlog);
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -6552,6 +6552,11 @@ nodefer: __kfree_skb(skb);
+@@ -6551,6 +6551,11 @@ nodefer: __kfree_skb(skb);
/* Make sure to trigger NET_RX_SOFTIRQ on the remote CPU
* if we are unlucky enough (this seems very unlikely).
*/