Hello Geert,
thanks for pointing out this conflict.
On Tue, Dec 03, 2024 at 10:48:36AM +0100, Geert Uytterhoeven wrote:
> On Tue, Dec 3, 2024 at 1:30 AM <patchwork-bot+netdevbpf@xxxxxxxxxx> wrote:
> > This patch was applied to netdev/net-next.git (main)
> > by Jakub Kicinski <kuba@xxxxxxxxxx>:
> >
> > On Sat, 30 Nov 2024 15:53:49 +0100 you wrote:
> > > After commit 0edb555a65d1 ("platform: Make platform_driver::remove()
> > > return void") .remove() is (again) the right callback to implement for
> > > platform drivers.
> > >
> > > Convert all platform drivers below drivers/ptp to use .remove(), with
> > > the eventual goal to drop struct platform_driver::remove_new(). As
> > > .remove() and .remove_new() have the same prototypes, conversion is done
> > > by just changing the structure member name in the driver initializer.
> > >
> > > [...]
> >
> > Here is the summary with links:
> > - ptp: Switch back to struct platform_driver::remove()
> > https://git.kernel.org/netdev/net-next/c/b32913a5609a
>
> Note that this now conflicts with commit e70140ba0d2b1a30 ("Get rid of
> 'remove_new' relic from platform driver struct") upstream.
Indeed. The differences are only about whitespace.
> Resolution: just take the version from upstream.
But IMHO my variant is better than Linus's. After Linus' change the =
for .probe and .remove are aligned in the conflicting files. However the
other members initialized there are only using a single space before the
=. My change used the single space variant consistently for the whole
initializer.
So I suggest to either drop my change, or in the conflict resolution
take my variant and not Linus's.
Best regards
Uwe
Attachment:
signature.asc
Description: PGP signature
