From: Ingo Molnar <mingo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Joel Granados <joel.granados@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the s390 tree
Date: Wed, 19 Mar 2025 20:50:44 +0100 [thread overview]
Message-ID: <Z9sgFGya_MDbfSQ6@gmail.com> (raw)
In-Reply-To: <20250319155410.3cdf01cb@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sysctl.c
>
> between commit:
>
> 20de8f8d3178 ("s390: Move s390 sysctls into their own file under arch/s390")
>
> from the s390 tree and commit:
>
> c305a4e98378 ("x86: Move sysctls into arch/x86")
>
> 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.
Thank you Stephen!
Ingo
next prev parent reply other threads:[~2025-03-19 19:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2025-03-28 14:16 ` Joel Granados
2025-03-26 1:28 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-04-18 13:40 broonie
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
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=Z9sgFGya_MDbfSQ6@gmail.com \
--to=mingo@kernel.org \
--cc=borntraeger@de.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=hpa@zytor.com \
--cc=joel.granados@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--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;
as well as URLs for NNTP newsgroup(s).