Re: [GIT PULL] Driver core changes for 5.18-rc1

[Greg KH]

On Mon, Mar 28, 2022 at 12:43:39PM -0700, Linus Torvalds wrote:
> On Mon, Mar 28, 2022 at 6:39 AM Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> >
> > There will be a merge conflict in drivers/power/supply/ab8500_chargalg.c
> > with your tree, the merge conflict should be easy (take all the
> > changes).
> 
> And by "take all the changes", I'm sure you mean "take none of them,
> since the code was removed upstream in the meantime".
> 
> Easy typo to make.

Heh, yes, "typo".  :(

You are right, I did the merge the wrong way, yours was correct, thanks
for catching that.

greg k-h