From: Chanwoo Choi <cwchoi00@gmail.com>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"MyungJoo Ham" <myungjoo.ham@samsung.com>,
"Chanwoo Choi" <cw00.choi@samsung.com>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
linux-kernel@vger.kernel.org, kernel@pengutronix.de
Subject: Re: [PATCH v2] extcon: Switch i2c drivers back to use .probe()
Date: Thu, 1 Jun 2023 23:45:24 +0900 [thread overview]
Message-ID: <20591cc8-8442-b9cb-545e-d5cbca543484@gmail.com> (raw)
In-Reply-To: <20230530051726.2155461-1-u.kleine-koenig@pengutronix.de>
On 23. 5. 30. 14:17, Uwe Kleine-König wrote:
> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
> call-back type"), all drivers being converted to .probe_new() and then
> 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter")
> convert back to (the new) .probe() to be able to eventually drop
> .probe_new() from struct i2c_driver.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Hello,
>
> On Mon, May 29, 2023 at 11:48:43PM +0900, Chanwoo Choi wrote:
>> When I tried to apply it, there is conflict for extcon-usbc-tusb320.c
>> extcon-usbc-tusb320.c was already changed to probe_new.
>> I'd like you to resend it on latest extcon-next branch. Thanks.
>
> I rebased onto
> git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon-next.
> (It would have helped a bit if you mentioned the URL, I assume you would
> have found it out more quickly than I did.) The relevant difference is a
> conflict with commit 3adbaa30d973 ("extcon: usbc-tusb320: Unregister
> typec port on driver removal") which added a .remove callback in the
> context.
>
Basically, all merged patch should be discussed on mailing list.
As you mention, I already knew that why conflict happen.
So I replied that you need to rebase it on latest extcon-next
and then ask the resend the patch without conflict.
Applied it.
Thanks,
Chanwoo Choi
prev parent reply other threads:[~2023-06-01 14:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 5:17 Uwe Kleine-König
2023-06-01 14:45 ` Chanwoo Choi [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=20591cc8-8442-b9cb-545e-d5cbca543484@gmail.com \
--to=cwchoi00@gmail.com \
--cc=cw00.choi@samsung.com \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®