Re: [GIT PULL] intel-pinctrl for 5.12-1

[Linus Walleij <linus.walleij@xxxxxxxxxx>]

On Tue, Jan 26, 2021 at 4:53 PM Andy Shevchenko
<andy.shevchenko@xxxxxxxxx> wrote:
> On Tue, Jan 26, 2021 at 4:38 PM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
> > On Tue, Jan 26, 2021 at 2:49 PM Andy Shevchenko
> > <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
> >
> > > The following changes since commit e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62:
> > >
> > >   Linux 5.11-rc2 (2021-01-03 15:55:30 -0800)
> > >
> > > are available in the Git repository at:
> > >
> > >   git@xxxxxxxxxxxxxxxxxxx:pub/scm/linux/kernel/git/pinctrl/intel.git tags/intel-pinctrl-v5.12-1
> > >
> > > for you to fetch changes up to 0e793a4e283487378e9a5b7db37bc1781bc72fd7:
> > >
> > >   pinctrl: tigerlake: Add Alder Lake-P ACPI ID (2021-01-08 16:04:50 +0200)
> >
> > Thanks Andy, I merged in v5.11-rc2 and then pulled this on top!
>
> JFYI: when you merge a branch that has been based on newer rc you
> don't need to merge that rc first.

True, it just gives me a feeling of understanding how the merges go when
I do that, so I see there was first a really large diffstat "hm what is that..
hmm seems to be based on -rc2 and my stuff is on -rc, OK I merge -rc2
and voila OK the diffstat is small, now I understand the merges".

Just my little dance to convince myself that I'm doing the right thing.

Yours,
Linus Walleij