[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAHp75VfhMpUW0GpzPMq=1GufAT+kZtO8AXCpyqip26W=vWNhRA@mail.gmail.com>
Date: Mon, 10 Aug 2020 11:18:35 +0300
From: Andy Shevchenko <andy.shevchenko@...il.com>
To: Linus Walleij <linus.walleij@...aro.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
"open list:GPIO SUBSYSTEM" <linux-gpio@...r.kernel.org>,
linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] pin control changes for the v5.9 kernel cycle
On Sun, Aug 9, 2020 at 4:07 PM Linus Walleij <linus.walleij@...aro.org> 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
Powered by blists - more mailing lists