From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Masahiro Yamada <masahiroy@kernel.org>
Subject: linux-next: manual merge of the tip tree with the kbuild tree
Date: Mon, 23 May 2022 14:24:31 +1000 [thread overview]
Message-ID: <20220523142431.10ff2f77@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 865 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
scripts/Makefile.build
between commit:
0212301af7bb ("kbuild: do not create *.prelink.o for Clang LTO or IBT")
from the kbuild tree and commit:
753da4179d08 ("objtool: Remove --lto and --vmlinux in favor of --link")
from the tip tree.
I am not sure if I fixed this up correctly, please check the final result
when linux-next is released.
I fixed it up (I used the former version) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-05-23 4:24 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-23 4:24 Stephen Rothwell [this message]
2022-05-23 5:37 ` linux-next: manual merge of the tip tree with the kbuild tree Masahiro Yamada
2022-05-23 5:46 ` Stephen Rothwell
2022-05-23 5:47 ` Stephen Rothwell
2022-05-23 16:23 ` Josh Poimboeuf
2022-05-27 2:19 ` Masahiro Yamada
2022-05-27 4:47 ` Josh Poimboeuf
2022-05-27 6:04 ` Masahiro Yamada
2022-05-27 12:18 ` Masahiro Yamada
2022-05-27 14:59 ` Josh Poimboeuf
-- strict thread matches above, loose matches on Subject: below --
2024-11-12 2:01 Stephen Rothwell
2024-11-12 9:27 ` Peter Zijlstra
2024-11-21 0:53 ` Stephen Rothwell
2024-05-17 1:30 Stephen Rothwell
2020-09-25 5:25 Stephen Rothwell
2020-10-15 1:57 ` Stephen Rothwell
2019-02-26 2:48 Stephen Rothwell
2018-12-20 4:57 Stephen Rothwell
2018-08-06 4:47 Stephen Rothwell
2018-08-14 23:26 ` Stephen Rothwell
2017-06-23 3:50 Stephen Rothwell
2017-07-03 1:08 ` Stephen Rothwell
2016-09-06 3:43 Stephen Rothwell
2013-02-18 3:35 Stephen Rothwell
2013-02-18 6:31 ` H. Peter Anvin
2012-05-07 5:10 Stephen Rothwell
2012-05-07 19:25 ` Michal Marek
2012-05-07 20:24 ` Sam Ravnborg
2011-05-20 3:36 Stephen Rothwell
2011-05-20 3:54 ` Steven Rostedt
2010-07-01 4:05 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=20220523142431.10ff2f77@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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