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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 6 Nov 2013 09:41:17 +0100
From:	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Linus Walleij <linus.walleij@...aro.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org
Subject: 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 ("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@...b.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/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/