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>,
Heiko Carstens <hca@linux•ibm.com>,
Vasily Gorbik <gor@linux•ibm.com>,
Christian Borntraeger <borntraeger@de•ibm.com>
Cc: Ingo Molnar <mingo@kernel•org>,
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: linux-next: manual merge of the tip tree with the s390 tree
Date: Wed, 19 Mar 2025 15:54:10 +1100 [thread overview]
Message-ID: <20250319155410.3cdf01cb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]
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.
--
Cheers,
Stephen Rothwell
diff --cc kernel/sysctl.c
index 6c70fb3b2376,4ebe6136b08d..000000000000
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -1888,15 -1843,15 +1834,6 @@@ static const struct ctl_table kern_tabl
.proc_handler = proc_dointvec,
},
#endif
- #if defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86)
-#if defined(CONFIG_S390) && defined(CONFIG_SMP)
-- {
- .procname = "acpi_video_flags",
- .data = &acpi_realmode_flags,
- .maxlen = sizeof (unsigned long),
- .procname = "spin_retry",
- .data = &spin_retry,
- .maxlen = sizeof (int),
-- .mode = 0644,
- .proc_handler = proc_doulongvec_minmax,
- .proc_handler = proc_dointvec,
-- },
--#endif
#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
{
.procname = "ignore-unaligned-usertrap",
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-03-19 4:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-19 4:54 Stephen Rothwell [this message]
2025-03-19 19:50 ` linux-next: manual merge of the tip tree with the s390 tree Ingo Molnar
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=20250319155410.3cdf01cb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=gor@linux$(echo .)ibm.com \
--cc=hca@linux$(echo .)ibm.com \
--cc=hpa@zytor$(echo .)com \
--cc=joel.granados@kernel$(echo .)org \
--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=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