From: Wei Yang <richard.weiyang@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mike Rapoport <rppt@kernel.org>, Theodore Ts'o <tytso@mit.edu>,
"Jason A. Donenfeld" <Jason@zx2c4.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Wei Yang <richard.weiyang@gmail.com>
Subject: Re: linux-next: manual merge of the random tree with the memblock tree
Date: Thu, 19 Sep 2024 23:45:57 +0000 [thread overview]
Message-ID: <20240919234557.hsvajq4qp4u3mhtg@master> (raw)
In-Reply-To: <20240919145356.2f205696@canb.auug.org.au>
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@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.
>
Do I need to send a new version?
>--
>Cheers,
>Stephen Rothwell
--
Wei Yang
Help you, Help me
next prev parent reply other threads:[~2024-09-19 23:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-27 5:04 Stephen Rothwell
2024-09-19 4:53 ` Stephen Rothwell
2024-09-19 23:45 ` Wei Yang [this message]
2024-09-20 0:26 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240919234557.hsvajq4qp4u3mhtg@master \
--to=richard.weiyang@gmail.com \
--cc=Jason@zx2c4.com \
--cc=christophe.leroy@csgroup.eu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®