lkml.org 
[lkml]   [2019]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the gpio-brgl tree with the gpio tree
On Fri, Aug 16, 2019 at 8:56 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
> include/linux/gpio/driver.h
>
> between commit:
>
> fdd61a013a24 ("gpio: Add support for hierarchical IRQ domains")
>
> from the gpio tree and commit:
>
> 9091373ab7ea ("gpio: remove less important #ifdef around declarations")
>
> from the gpio-brgl tree.

OK Bartosz can you send me a pull request for your tree so we can
sync them up?

Yours,
Linus Walleij

\
 
 \ /
  Last update: 2019-08-17 00:31    [W:0.037 / U:2.328 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site