linux-next: manual merge of the gpio tree with the xtensa tree

[Stephen Rothwell]

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.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell s...@canb.auug.org.au

diff --cc arch/xtensa/Kconfig
index 70a160be3464,f8df0cc70cb6..000000000000
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -64,9 -64,9 +64,12 @@@ config MM
config VARIANT_IRQ_SWITCH
def_bool n

+config MAY_HAVE_SMP
+ def_bool n
+
+ config HAVE_XTENSA_GPIO32
+ def_bool n
+
menu "Processor type and features"

choice

[Linus Walleij]

On Wed, Jan 8, 2014 at 5:14 AM, Stephen Rothwell <s...@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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/