Re: linux-next: manual merge of the tip tree with the arm64 tree

[Catalin Marinas]

On Wed, Mar 18, 2020 at 03:27:31PM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/Kconfig
> index fdfdc77c5067,c6c32fb7f546..000000000000
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@@ -9,8 -9,6 +9,7 @@@ config ARM6
>   	select ACPI_MCFG if (ACPI && PCI)
>   	select ACPI_SPCR_TABLE if ACPI
>   	select ACPI_PPTT if ACPI
>  +	select ARCH_BINFMT_ELF_STATE
> - 	select ARCH_CLOCKSOURCE_DATA
>   	select ARCH_HAS_DEBUG_VIRTUAL
>   	select ARCH_HAS_DEVMEM_IS_ALLOWED
>   	select ARCH_HAS_DMA_PREP_COHERENT

It looks fine. Thanks.

-- 
Catalin