Subject: Re: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 28 Apr 2022 11:29:28 +1000

Hi all,

On Thu, 28 Apr 2022 11:19:03 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> diff --cc net/core/dev.c
> index 1461c2d9dec8,611bd7197064..000000000000
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@@ -10352,9 -10409,10 +10405,10 @@@ struct rtnl_link_stats64 *dev_get_stats
>   
>   		for_each_possible_cpu(i) {
>   			core_stats = per_cpu_ptr(p, i);
>  -			storage->rx_dropped += local_read(&core_stats->rx_dropped);
>  -			storage->tx_dropped += local_read(&core_stats->tx_dropped);
>  -			storage->rx_nohandler += local_read(&core_stats->rx_nohandler);
>  -			storage->rx_otherhost_dropped += local_read(&core_stats->rx_otherhost_dropped);
>  +			storage->rx_dropped += READ_ONCE(core_stats->rx_dropped);
>  +			storage->tx_dropped += READ_ONCE(core_stats->tx_dropped);
>  +			storage->rx_nohandler += READ_ONCE(core_stats->rx_nohandler);
> ++			storage->rx_otherhost_dropped += READ_ONCE(&core_stats->rx_otherhost_dropped);
                                                                   ^
I failed to remove the '&'.  I have done that now to fix up my merge
resolution.

-- 
Cheers,
Stephen Rothwell