[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250220103223.5f2c0c58@kernel.org>
Date: Thu, 20 Feb 2025 10:32:23 -0800
From: Jakub Kicinski <kuba@...nel.org>
To: Sean Anderson <sean.anderson@...ux.dev>
Cc: patchwork-bot+netdevbpf@...nel.org, nicolas.ferre@...rochip.com,
claudiu.beznea@...on.dev, netdev@...r.kernel.org, davem@...emloft.net,
edumazet@...gle.com, andrew+netdev@...n.ch, pabeni@...hat.com,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH net-next 0/2] net: cadence: macb: Modernize statistics
reporting
On Thu, 20 Feb 2025 13:22:29 -0500 Sean Anderson wrote:
> > If no - will the code in net still work (just lacking lock protection)?
> >
> > If there is a conflict you can share a resolution with me and I'll slap
> > it on as part of the merge.
>
> OK, what's the best way to create that? git rerere?
rerere image or a three way diff will work
Powered by blists - more mailing lists