Messages in this thread | | | Date | Wed, 8 Jan 2014 09:02:27 +0100 | Subject | Re: linux-next: manual merge of the gpio tree with the xtensa tree | From | Linus Walleij <> |
| |
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
| |