lkml.org 
[lkml]   [2014]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the gpio tree with the xtensa tree
From
On Wed, Jan 8, 2014 at 5:14 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Linus,
>
> Today's linux-next merge of the gpio tree got a conflict in
> arch/xtensa/Kconfig between commit dbacef090841 ("xtensa: add SMP
> support") from the xtensa tree and commit a1a2bdec4772 ("gpio: xtensa:
> depend on HAVE_XTENSA_GPIO32") from the gpio tree.

Looks correct, thanks!

Yours,
Linus Walleij


\
 
 \ /
  Last update: 2014-01-08 09:41    [W:0.069 / U:0.604 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site