From: Jakub Kicinski <kuba@kernel•org>
To: "Uwe Kleine-König" <u.kleine-koenig@baylibre•com>
Cc: Geert Uytterhoeven <geert@linux-m68k•org>,
richardcochran@gmail•com, yangbo.lu@nxp•com, dwmw2@infradead•org,
Linus Torvalds <torvalds@linux-foundation•org>,
netdev@vger•kernel.org, linux-kernel@vger•kernel.org,
Linux-Next <linux-next@vger•kernel.org>
Subject: Re: [PATCH] ptp: Switch back to struct platform_driver::remove()
Date: Tue, 3 Dec 2024 17:19:10 -0800 [thread overview]
Message-ID: <20241203171910.27c0a170@kernel.org> (raw)
In-Reply-To: <5qiehbnmzufzqjgn2l4jcghebdx7llr52lgl7hi2jizpg7gfnd@c73bpxxxdeiv>
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.
prev parent reply other threads:[~2024-12-04 1:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241203171910.27c0a170@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=dwmw2@infradead$(echo .)org \
--cc=geert@linux-m68k$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=richardcochran@gmail$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=u.kleine-koenig@baylibre$(echo .)com \
--cc=yangbo.lu@nxp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox