Re: [GIT PULL] pin control changes for the v5.9 kernel cycle

From: Andy Shevchenko
Date: Mon Aug 10 2020 - 04:18:53 EST


On Sun, Aug 9, 2020 at 4:07 PM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
>
> Hi Linus,
>
> here is the big bulk of pin control changes for the v5.9
> kernel cycle, nothing is particularly interesting.
>
> I expect you to see two conflicts:
>
> drivers/pinctrl/intel/pinctrl-baytrail.c - no idea what this
> is about as both HEAD and mine look the same to human
> eyes, I suppose whitespace. Take whichever version you
> like.

I have also stumbled over this when back merging to one of our internal trees...

--
With Best Regards,
Andy Shevchenko