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

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]

Message-ID: <20240919234557.hsvajq4qp4u3mhtg@master>
Date: Thu, 19 Sep 2024 23:45:57 +0000
From: Wei Yang <richard.weiyang@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Mike Rapoport <rppt@...nel.org>, Theodore Ts'o <tytso@....edu>,
	"Jason A. Donenfeld" <Jason@...c4.com>,
	Christophe Leroy <christophe.leroy@...roup.eu>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Wei Yang <richard.weiyang@...il.com>
Subject: Re: linux-next: manual merge of the random tree with the memblock
 tree

On Thu, Sep 19, 2024 at 02:53:56PM +1000, Stephen Rothwell wrote:
>Hi all,
>
>On Tue, 27 Aug 2024 15:04:53 +1000 Stephen Rothwell <sfr@...b.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.
>

Do I need to send a new version? 

>-- 
>Cheers,
>Stephen Rothwell



-- 
Wei Yang
Help you, Help me