From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Luis Chamberlain <mcgrof@kernel.org>, Arnd Bergmann <arnd@arndb.de>
Cc: Ard Biesheuvel <ardb@kernel.org>,
Joel Granados <j.granados@samsung.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the sysctl tree with the asm-generic tree
Date: Thu, 21 Sep 2023 11:50:34 +1000 [thread overview]
Message-ID: <20230921115034.5461f62f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 763 bytes --]
Hi all,
Today's linux-next merge of the sysctl tree got a conflict in:
arch/ia64/kernel/crash.c
between commit:
cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
from the asm-generic tree and commit:
d2f2ef357794 ("ia64: Remove now superfluous sentinel element from ctl_table array")
from the sysctl tree.
I fixed it up (I removed the file) 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:[~2023-09-21 1:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20230921015042eucas1p1f8658fd99d9e7befc3926bb71d917c86@eucas1p1.samsung.com>
2023-09-21 1:50 ` Stephen Rothwell [this message]
2023-09-21 3:02 ` linux-next: manual merge of the sysctl tree with the asm-generic tree Luis Chamberlain
2023-09-21 3:56 ` Stephen Rothwell
2023-09-25 13:51 ` Joel Granados
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=20230921115034.5461f62f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=j.granados@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mcgrof@kernel.org \
/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