Re: [GIT PULL] intel-gpio for 5.12-2

[Andy Shevchenko <andy.shevchenko@xxxxxxxxx>]

On Tue, Mar 9, 2021 at 5:34 PM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
> On Tue, Mar 9, 2021 at 4:24 PM Bartosz Golaszewski <brgl@xxxxxxxx> wrote:
> > On Mon, Mar 8, 2021 at 11:26 AM Andy Shevchenko
> > <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
> > >
> > > On Sat, Mar 06, 2021 at 12:38:33PM +0100, Bartosz Golaszewski wrote:
> > > > On Wed, Mar 3, 2021 at 3:09 PM Andy Shevchenko
> > > > <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
> > > > >
> > > > > Hi Linux GPIO and ACPI maintainers,
> > > > >
> > > > > This is material for v5.12-rcX (presumably -rc2). Since it touches ACPI, this
> > > > > PR is to both subsystems.
> > >
> > > > Pulled, thanks!
> > >
> > > Thanks! Though I don't see it in your repository.

> > For some reason the merge commit doesn't show up but I do have the
> > patches. Strange, I remember seeing the merge commit when I pulled it.
>
> Did you rebase the branch after pulling?
>
> That will drop the merge commit, and will also make linux-next
> complain that the commiter has not signed off the commits.
> (I.e. don't rebase a branch where you pulled in something.)

Actually one may use --rebase-merges (that's my default option after I
learn it, okay, I actually learnt its predecessor).

-- 
With Best Regards,
Andy Shevchenko