From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the s390 tree with Linus' tree
Date: Sun, 22 Feb 2015 11:27:13 +1100 [thread overview]
Message-ID: <20150222112713.1fd0a359@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]
Hi all,
Today's linux-next merge of the s390 tree got a conflict in
arch/s390/kernel/early.c between commit 61b0b01686d4 ("s390/spinlock:
disabled compare-and-delay by default") from Linus' tree and commit
c5f43f0a70fc ("s390: remove 31 bit support") from the s390 tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/s390/kernel/early.c
index 4427ab7ac23a,434b4d26a8db..000000000000
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@@ -393,19 -328,16 +328,18 @@@ static __init void detect_machine_facil
S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_LC;
if (test_facility(129))
S390_lowcore.machine_flags |= MACHINE_FLAG_VX;
- #endif
- if (test_facility(128))
- S390_lowcore.machine_flags |= MACHINE_FLAG_CAD;
}
-static int __init nocad_setup(char *str)
+static int __init cad_setup(char *str)
{
- S390_lowcore.machine_flags &= ~MACHINE_FLAG_CAD;
+ int val;
+
+ get_option(&str, &val);
+ if (val && test_facility(128))
+ S390_lowcore.machine_flags |= MACHINE_FLAG_CAD;
return 0;
}
-early_param("nocad", nocad_setup);
+early_param("cad", cad_setup);
static int __init cad_init(void)
{
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-02-22 0:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-22 0:27 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
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=20150222112713.1fd0a359@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
/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).