Re: linux-next: manual merge of the gpio tree with the arm-soc and cortex trees

Hi Uwe, On Wed, 6 Nov 2013 09:41:17 +0100 Uwe Kleine-König wrote: > > BTW, "cortex" is a bit too general. My tree is only about Cortex-M. Also > you can drop -2.6 from the URL. Updated both, thanks. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpDNpGVBonys.pgp Descr

Re: linux-next: manual merge of the gpio tree with the arm-soc and cortex trees

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 ("AR

linux-next: manual merge of the gpio tree with the arm-soc and cortex trees

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 ffde39e