* Re: [PATCH] ptp: Switch back to struct platform_driver::remove()
[not found] ` <173318582905.3964978.17617943251785066504.git-patchwork-notify@kernel.org>
@ 2024-12-03 9:48 ` Geert Uytterhoeven
2024-12-03 11:49 ` Uwe Kleine-König
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2024-12-03 9:48 UTC (permalink / raw)
To: Uwe Kleine-König, Jakub Kicinski
Cc: richardcochran, yangbo.lu, dwmw2, Linus Torvalds, netdev,
linux-kernel, Linux-Next
On Tue, Dec 3, 2024 at 1:30 AM <patchwork-bot+netdevbpf@kernel•org> wrote:
> This patch was applied to netdev/net-next.git (main)
> by Jakub Kicinski <kuba@kernel•org>:
>
> 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.
Resolution: just take the version from upstream.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k•org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ptp: Switch back to struct platform_driver::remove()
2024-12-03 9:48 ` [PATCH] ptp: Switch back to struct platform_driver::remove() Geert Uytterhoeven
@ 2024-12-03 11:49 ` Uwe Kleine-König
2024-12-04 1:19 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Uwe Kleine-König @ 2024-12-03 11:49 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Jakub Kicinski, richardcochran, yangbo.lu, dwmw2, Linus Torvalds,
netdev, linux-kernel, Linux-Next
[-- Attachment #1: Type: text/plain, Size: 1725 bytes --]
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@kernel•org> wrote:
> > This patch was applied to netdev/net-next.git (main)
> > by Jakub Kicinski <kuba@kernel•org>:
> >
> > 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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ptp: Switch back to struct platform_driver::remove()
2024-12-03 11:49 ` Uwe Kleine-König
@ 2024-12-04 1:19 ` Jakub Kicinski
0 siblings, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2024-12-04 1:19 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Geert Uytterhoeven, richardcochran, yangbo.lu, dwmw2,
Linus Torvalds, netdev, linux-kernel, Linux-Next
On Tue, 3 Dec 2024 12:49:54 +0100 Uwe Kleine-König wrote:
> > 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.
I'll revert, it's less work.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-04 1:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20241130145349.899477-2-u.kleine-koenig@baylibre.com>
[not found] ` <173318582905.3964978.17617943251785066504.git-patchwork-notify@kernel.org>
2024-12-03 9:48 ` [PATCH] ptp: Switch back to struct platform_driver::remove() Geert Uytterhoeven
2024-12-03 11:49 ` Uwe Kleine-König
2024-12-04 1:19 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox