6.1.120-rt46 and build failure due to conflict with rebase against 34d21de99cea ("net: Move {l,t,d}stats allocation to core and convert veth & vrf") (was: Re: [ANNOUNCE] 6.1.120-rt46)

[Salvatore Bonaccorso <carnil@debian.org>]

Hi,

On Tue, Dec 17, 2024 at 07:37:47PM -0000, Clark Williams wrote:
> Hello RT-list!
> 
> I'm pleased to announce the 6.1.120-rt46 stable release.
> 
> 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: 061eae4897c2fee62fed3f946864107faf3292b7
> 
> Or to build 6.1.120-rt46 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-rt46.patch.xz
> 
> 
> Enjoy!
> Clark
> 
> Changes from v6.1.119-rt45:

In v6.1.120 there was a backport of 34d21de99cea ("net: Move
{l,t,d}stats allocation to core and convert veth & vrf") .

AFAICS, this conflicts with the v6.1.120-rt46, in the patch

0005-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch

and causes a build failure:

/home/build/linux-6.1.122/debian/build/source_rt/drivers/net/vrf.c: In function ‘vrf_get_stats64’:
/home/build/linux-6.1.122/debian/build/source_rt/drivers/net/vrf.c:157:41: error: ‘const struct pcpu_dstats’ has no member named ‘rx_pkts’; did you mean ‘rx_packets’?
  157 |                         rpkts = dstats->rx_pkts;
      |                                         ^~~~~~~
      |                                         rx_packets


I guess the rt patchset for 6.1.120 was just not cleanly rebased for
the 0005-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch
patch:

--- a/0005-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch
+++ b/0005-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch
@@ -2012,7 +2012,7 @@ index c8a1009d659e..c3e5fb98cf7f 100644
                        rbytes = dstats->rx_bytes;
 -                      rpkts = dstats->rx_packets;
 -              } while (u64_stats_fetch_retry_irq(&dstats->syncp, start));
-+                      rpkts = dstats->rx_pkts;
++                      rpkts = dstats->rx_packets;
 +              } while (u64_stats_fetch_retry(&dstats->syncp, start));
                stats->tx_bytes += tbytes;
                stats->tx_packets += tpkts;

Regards,
Salvatore