Re: linux-next: manual merge of the asm-generic tree with the kbuild tree

[Stephen Rothwell]

Hi all,

On Thu, 7 Mar 2024 09:38:07 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the asm-generic tree got a conflict in:
> 
>   arch/hexagon/Kconfig
> 
> between commit:
> 
>   6b1c2a19cb30 ("hexagon: select FRAME_POINTER instead of redefining it")
> 
> from the kbuild tree and commit:
> 
>   ba89f9c8ccba ("arch: consolidate existing CONFIG_PAGE_SIZE_*KB definitions")
> 
> from the asm-generic tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc arch/hexagon/Kconfig
> index 89672ef0666f,1414052e7d6b..000000000000
> --- a/arch/hexagon/Kconfig
> +++ b/arch/hexagon/Kconfig
> @@@ -7,9 -7,11 +7,13 @@@ config HEXAGO
>   	select ARCH_32BIT_OFF_T
>   	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
>   	select ARCH_NO_PREEMPT
>  +	select ARCH_WANT_FRAME_POINTERS
>   	select DMA_GLOBAL_POOL
>  +	select FRAME_POINTER
> + 	select HAVE_PAGE_SIZE_4KB
> + 	select HAVE_PAGE_SIZE_16KB
> + 	select HAVE_PAGE_SIZE_64KB
> + 	select HAVE_PAGE_SIZE_256KB
>   	# Other pending projects/to-do items.
>   	# select HAVE_REGS_AND_STACK_ACCESS_API
>   	# select HAVE_HW_BREAKPOINT if PERF_EVENTS

This is now a conflict between the kbuild tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpA90PMOg39K.pgp
Description: OpenPGP digital signature