Re: linux-next: manual merge of the gpio tree with the kspp-gustavo tree

2020-11-18 Thread Gustavo A. R. Silva
On Wed, Nov 18, 2020 at 04:15:37PM +0200, Andy Shevchenko wrote: > No problem, thanks for taking care of this. > > As Linus mentioned, please send a formal patch he will include in his tree. > (I have noticed that there are two drivers in the same change, I recommend > to split, so should be two

Re: linux-next: manual merge of the gpio tree with the kspp-gustavo tree

2020-11-18 Thread Andy Shevchenko
On Wed, Nov 18, 2020 at 05:00:57AM -0600, Gustavo A. R. Silva wrote: > On Wed, Nov 18, 2020 at 12:52:25PM +0200, Andy Shevchenko wrote: > > On Wed, Nov 18, 2020 at 11:29 AM Andy Shevchenko > > wrote: > > > On Wed, Nov 18, 2020 at 9:53 AM Linus Walleij > > > wrote: > > > > On Wed, Nov 18, 2020

Re: linux-next: manual merge of the gpio tree with the kspp-gustavo tree

2020-11-18 Thread Gustavo A. R. Silva
Hi Andy, On Wed, Nov 18, 2020 at 12:52:25PM +0200, Andy Shevchenko wrote: > On Wed, Nov 18, 2020 at 11:29 AM Andy Shevchenko > wrote: > > On Wed, Nov 18, 2020 at 9:53 AM Linus Walleij > > wrote: > > > On Wed, Nov 18, 2020 at 4:24 AM Stephen Rothwell > > > wrote: > > > > > > > b8e0b635e6e6

Re: linux-next: manual merge of the gpio tree with the kspp-gustavo tree

2020-11-18 Thread Andy Shevchenko
On Wed, Nov 18, 2020 at 11:29 AM Andy Shevchenko wrote: > On Wed, Nov 18, 2020 at 9:53 AM Linus Walleij > wrote: > > On Wed, Nov 18, 2020 at 4:24 AM Stephen Rothwell > > wrote: > > > > > b8e0b635e6e6 ("gpio: Fix fall-through warnings for Clang") > > > > > > from the kspp-gustavo tree and

Re: linux-next: manual merge of the gpio tree with the kspp-gustavo tree

2020-11-18 Thread Andy Shevchenko
On Wed, Nov 18, 2020 at 9:53 AM Linus Walleij wrote: > > On Wed, Nov 18, 2020 at 4:24 AM Stephen Rothwell > wrote: > > > b8e0b635e6e6 ("gpio: Fix fall-through warnings for Clang") > > > > from the kspp-gustavo tree and commit: Stephen, the fix looks good to me. > Interesting I guess this is

Re: linux-next: manual merge of the gpio tree with the kspp-gustavo tree

2020-11-17 Thread Linus Walleij
On Wed, Nov 18, 2020 at 4:24 AM Stephen Rothwell wrote: > b8e0b635e6e6 ("gpio: Fix fall-through warnings for Clang") > > from the kspp-gustavo tree and commit: Interesting I guess this is a clang tree? Please rebase on the GPIO tree and send me + Andy this patch so we can integrate it

linux-next: manual merge of the gpio tree with the kspp-gustavo tree

2020-11-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the gpio tree got a conflict in: drivers/gpio/gpiolib-acpi.c between commit: b8e0b635e6e6 ("gpio: Fix fall-through warnings for Clang") from the kspp-gustavo tree and commit: 1a81f19154b4 ("gpiolib: acpi: Move acpi_gpio_to_gpiod_flags() upper in the