From: broonie@kernel.org
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H . Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Heiko Carstens <hca@linux.ibm.com>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Vasily Gorbik <gor@linux.ibm.com>
Subject: linux-next: manual merge of the tip tree with the s390 tree
Date: Tue, 18 Apr 2023 14:40:10 +0100 [thread overview]
Message-ID: <20230418134010.69844-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/s390/kernel/setup.c
between commit:
944c78376a39b ("s390: use init_thread_union aka initial stack for the first process")
from the s390 tree and commit:
9ea7e6b62c2bd ("init: Mark [arch_call_]rest_init() __noreturn")
from the tip 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 arch/s390/kernel/setup.c
index 0903fe3566341,4259b6c505163..0000000000000
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
next reply other threads:[~2023-04-18 13:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 13:40 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-19 4:54 linux-next: manual merge of the tip tree with the s390 tree Stephen Rothwell
2025-03-19 19:50 ` Ingo Molnar
2025-03-28 14:16 ` Joel Granados
2025-03-26 1:28 ` Stephen Rothwell
2023-02-10 1:00 Stephen Rothwell
2023-02-21 23:03 ` Stephen Rothwell
2019-05-06 6:58 Stephen Rothwell
2017-11-01 6:04 Stephen Rothwell
2017-10-11 15:51 Mark Brown
2017-11-13 5:30 ` Stephen Rothwell
2015-08-20 5:32 Stephen Rothwell
2013-02-07 2:50 Stephen Rothwell
2012-03-14 3:46 Stephen Rothwell
2009-08-24 7:01 Stephen Rothwell
2009-08-24 8:17 ` Heiko Carstens
2009-08-24 8:23 ` Stephen Rothwell
2009-08-24 8:53 ` Ingo Molnar
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=20230418134010.69844-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=hpa@zytor.com \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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