From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Heiko Carstens <hca@linux•ibm.com>,
Vasily Gorbik <gor@linux•ibm.com>,
Christian Borntraeger <borntraeger@de•ibm.com>
Cc: Alexander Gordeev <agordeev@linux•ibm.com>,
Eric Biggers <ebiggers@google•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 s390 tree with Linus' tree
Date: Wed, 29 Jan 2025 11:59:32 +1100 [thread overview]
Message-ID: <20250129115932.7950d88d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
Hi all,
Today's linux-next merge of the s390 tree got a conflict in:
arch/s390/Kconfig
between commit:
008071917dfc ("s390/crc32: expose CRC32 functions through lib")
from Linus' tree and commit:
3bcc8a1af581 ("s390/sclp: Initialize sclp subsystem via arch_cpu_finalize_init()")
from the s390 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/s390/Kconfig
index 6e9545d8b0c7,f49ca2b485f6..000000000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -72,7 -78,7 +78,8 @@@ config S39
select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM
select ARCH_ENABLE_MEMORY_HOTREMOVE
select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
+ select ARCH_HAS_CPU_FINALIZE_INIT
+ select ARCH_HAS_CRC32
select ARCH_HAS_CURRENT_STACK_POINTER
select ARCH_HAS_DEBUG_VIRTUAL
select ARCH_HAS_DEBUG_VM_PGTABLE
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-01-29 0:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-29 0:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-29 0:10 linux-next: manual merge of the s390 tree with Linus' tree Stephen Rothwell
2017-09-03 23:49 Stephen Rothwell
2017-09-04 12:45 ` Martin Schwidefsky
2015-04-20 2:02 Stephen Rothwell
2015-02-22 0:27 Stephen Rothwell
2011-05-19 0:35 Stephen Rothwell
2011-05-20 18:43 ` Jens Axboe
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=20250129115932.7950d88d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agordeev@linux$(echo .)ibm.com \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=ebiggers@google$(echo .)com \
--cc=gor@linux$(echo .)ibm.com \
--cc=hca@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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