Re: linux-next: manual merge of the random tree with the memblock tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1432 bytes --]

Hi all,

On Tue, 27 Aug 2024 15:04:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the random tree got a conflict in:
> 
>   tools/include/linux/linkage.h
> 
> between commit:
> 
>   d68c08173b70 ("memblock tests: include export.h in linkage.h as kernel dose")
> 
> from the memblock tree and commit:
> 
>   9fcce2aaea8a ("selftests/vDSO: fix include order in build of test_vdso_chacha")
> 
> from the random 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.
> 
> diff --cc tools/include/linux/linkage.h
> index 20dee24d7e1b,a48ff086899c..000000000000
> --- a/tools/include/linux/linkage.h
> +++ b/tools/include/linux/linkage.h
> @@@ -1,6 -1,8 +1,10 @@@
>   #ifndef _TOOLS_INCLUDE_LINUX_LINKAGE_H
>   #define _TOOLS_INCLUDE_LINUX_LINKAGE_H
>   
>  +#include <linux/export.h>
>  +
> + #define SYM_FUNC_START(x) .globl x; x:
> + 
> + #define SYM_FUNC_END(x)
> + 
>   #endif /* _TOOLS_INCLUDE_LINUX_LINKAGE_H */

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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]