Re: [GIT PULL] extcon next for 6.4

From: Greg Kroah-Hartman
Date: Sun Apr 30 2023 - 04:00:25 EST


On Sun, Apr 30, 2023 at 09:29:39AM +0900, Chanwoo Choi wrote:
> On 23. 4. 28. 15:12, Greg Kroah-Hartman wrote:
> > On Wed, Apr 26, 2023 at 03:49:17AM +0900, Chanwoo Choi wrote:
> >> Dear Greg,
> >>
> >> On 23. 4. 25. 22:22, Greg Kroah-Hartman wrote:
> >>> On Tue, Apr 25, 2023 at 09:58:47PM +0900, Chanwoo Choi wrote:
> >>>> Dear Greg,
> >>>>
> >>>> Gently ping for v6.4.
> >>>
> >>> Ouch, something went wrong with your first email and it ended up in my
> >>> spam folder in gmail, so sorry about that :(
> >>
> >> I'm sorry. I'll use the @kernel.org account on next time.
> >>
> >>
> >>>
> >>> Is your tree included in linux-next already?
> >>>
> >>
> >> Yes. extcon.git was included in linux-next.
> >>
> >> And my pull request edited the 'class_create()'
> >> Thus, it might have a conflict as following report[1] from Stetphen Rothwell (linux-next.git).
> >> [1] https://lore.kernel.org/lkml/ZBhOTW9v9jzJVY7e@xxxxxxxxx/
> >
> > Ok, I tried to pull this today, but I get the following error:
> >
> > Commit: 40f9fc3c2b38 ("extcon: usbc-tusb320: add USB_ROLE_SWITCH dependency")
> > Fixes tag: Fixes: 19685ae43489 ("extcon: usbc-tusb320: add usb_role_switch support")
> > Has these problem(s):
> > - Target SHA1 does not exist
> >
> > Are you sure that linux-next actually passed this tree?
> >
> > All of these were added to your tree only 12 days ago. Perhaps we should just
> > wait until 6.5-rc1 for the new features, and take the bug fixes now? Can you
> > redo this to make it so I can take the bugfixes after 6.4-rc1 is out, and throw
> > away this tree for now?
>
> Dear Greg,
>
> I'm so sorry for my fault. I rebased extcon-next tree based on char-misc.git(v6.3-rc6)
> right before sending the pull request. It it the reason to be changed of the commit id.

Please don't rebase unless you really really have a good reason to.
It's almost never needed.

> I'll fix issue and then send the pull request for 6.5-rc1 on later. I'll not rebase
> the extcon branch before sending the pull request and use the kernel.org email.

Great, that should work, thanks.

greg k-h