From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linus Walleij <linus.walleij@linaro•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Subject: Re: linux-next: manual merge of the gpio tree with the arm-soc and cortex trees
Date: Wed, 6 Nov 2013 09:41:17 +0100 [thread overview]
Message-ID: <20131106084117.GT14892@pengutronix.de> (raw)
In-Reply-To: <20131106191454.5f45b0b5300f03e74a6a09eb@canb.auug.org.au>
Hello Stephen,
On Wed, Nov 06, 2013 at 07:14:54PM +1100, Stephen Rothwell wrote:
> Hi Linus,
>
> Today's linux-next merge of the gpio tree got a conflict in
> arch/arm/Kconfig between commit f3372c01816e ("ARM: gemini: convert to
> GENERIC_CLOCKEVENTS") from the arm-soc tree and f5caa3b59e18 ("ARM:
> deprecate mach/timex.h for !ARCH_MULTIPLATFORM") from the cortex tree and
> commits ffde39ea61ea ("ARM: mmp: delete the custom GPIO header"),
> 88f718e3fa4d ("ARM: pxa: delete the custom GPIO header") and 85649711a895
> ("ARM: gemini: delete <mach/gpio.h>") from the gpio tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
looks correct.
BTW, "cortex" is a bit too general. My tree is only about Cortex-M. Also
you can drop -2.6 from the URL.
Best regards
Uwe
>
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc arch/arm/Kconfig
> index 568d6471dd18,c6debe07f036..000000000000
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@@ -397,10 -386,8 +397,9 @@@ config ARCH_CLPS711
> config ARCH_GEMINI
> bool "Cortina Systems Gemini"
> select ARCH_REQUIRE_GPIOLIB
> - select ARCH_USES_GETTIMEOFFSET
> + select CLKSRC_MMIO
> select CPU_FA526
> + select GENERIC_CLOCKEVENTS
> - select NEED_MACH_GPIO_H
> help
> Support for the Cortina Systems Gemini family SoCs
>
> @@@ -593,8 -558,6 +592,7 @@@ config ARCH_MM
> select GPIO_PXA
> select IRQ_DOMAIN
> select MULTI_IRQ_HANDLER
> - select NEED_MACH_GPIO_H
> + select NEED_MACH_TIMEX_H
> select PINCTRL
> select PLAT_PXA
> select SPARSE_IRQ
> @@@ -658,8 -620,6 +656,7 @@@ config ARCH_PX
> select GPIO_PXA
> select HAVE_IDE
> select MULTI_IRQ_HANDLER
> - select NEED_MACH_GPIO_H
> + select NEED_MACH_TIMEX_H
> select PLAT_PXA
> select SPARSE_IRQ
> help
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2013-11-06 8:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-06 8:14 linux-next: manual merge of the gpio tree with the arm-soc and cortex trees Stephen Rothwell
2013-11-06 8:41 ` Uwe Kleine-König [this message]
2013-11-07 23:38 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131106084117.GT14892@pengutronix.de \
--to=u.kleine-koenig@pengutronix$(echo .)de \
--cc=arnd@arndb$(echo .)de \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox