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>,
Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>
Cc: Guo Ren <guoren@kernel•org>, Guo Ren <guoren@linux•alibaba.com>,
Ingo Molnar <mingo@kernel•org>,
Juerg Haefliger <juerg.haefliger@canonical•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Palmer Dabbelt <palmer@rivosinc•com>
Subject: linux-next: manual merge of the tip tree with the risc-v tree
Date: Thu, 26 May 2022 13:02:28 +1000 [thread overview]
Message-ID: <20220526130228.332e59a7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/Kconfig
between commit:
0cbed0ee1dbc ("arch: Add SYSVIPC_COMPAT for all architectures")
from the risc-v tree and commit:
758cd94a0e16 ("x86/Kconfig: Fix indentation and add endif comments to arch/x86/Kconfig")
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.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/Kconfig
index 98eaa8870f28,4d610ae216ce..000000000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2869,7 -2861,11 +2867,7 @@@ config COMPA
if COMPAT
config COMPAT_FOR_U64_ALIGNMENT
def_bool y
- endif
-
-config SYSVIPC_COMPAT
- def_bool y
- depends on SYSVIPC
+ endif # COMPAT
endmenu
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-05-26 3:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 3:02 Stephen Rothwell [this message]
2022-05-26 6:35 ` linux-next: manual merge of the tip tree with the risc-v tree Guo Ren
-- strict thread matches above, loose matches on Subject: below --
2025-09-19 13:24 Mark Brown
2026-01-22 15:32 Mark Brown
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=20220526130228.332e59a7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=guoren@kernel$(echo .)org \
--cc=guoren@linux$(echo .)alibaba.com \
--cc=hpa@zytor$(echo .)com \
--cc=juerg.haefliger@canonical$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmer@rivosinc$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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