From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Michael Ellerman <mpe@ellerman•id.au>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
linuxppc-dev@lists•ozlabs.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kevin Hao <haokexin@gmail•com>, Jason Baron <jbaron@akamai•com>
Subject: linux-next: manual merge of the akpm tree with the powerpc tree
Date: Tue, 2 Aug 2016 13:39:54 +1000 [thread overview]
Message-ID: <20160802133954.00eac68c@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
kernel/jump_label.c
between commit:
e3f91083facb ("jump_label: Make it possible for arches to invoke jump_label_init() earlier")
from the powerpc tree and patch:
"jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL"
from the akpm 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/jump_label.c
index 85b7105fdd86,20400055f177..000000000000
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@@ -235,9 -279,15 +279,18 @@@ void __init jump_label_init(void
struct static_key *key = NULL;
struct jump_entry *iter;
+ /*
+ * Since we are initializing the static_key.enabled field with
+ * with the 'raw' int values (to avoid pulling in atomic.h) in
+ * jump_label.h, let's make sure that is safe. There are only two
+ * cases to check since we initialize to 0 or 1.
+ */
+ BUILD_BUG_ON((int)ATOMIC_INIT(0) != 0);
+ BUILD_BUG_ON((int)ATOMIC_INIT(1) != 1);
+
+ if (static_key_initialized)
+ return;
+
jump_label_lock();
jump_label_sort_entries(iter_start, iter_stop);
next reply other threads:[~2016-08-02 3:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-02 3:39 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-28 9:56 linux-next: manual merge of the akpm tree with the powerpc tree Stephen Rothwell
2020-03-06 6:39 Stephen Rothwell
2020-03-06 5:29 Stephen Rothwell
2016-11-15 3:52 Stephen Rothwell
2013-06-26 6:56 Stephen Rothwell
2013-06-26 8:10 ` Benjamin Herrenschmidt
2013-06-26 13:13 ` Andrew Morton
2013-06-26 14:19 ` Oleg Nesterov
2013-06-26 21:56 ` Benjamin Herrenschmidt
2012-03-13 9:10 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=20160802133954.00eac68c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=benh@kernel$(echo .)crashing.org \
--cc=haokexin@gmail$(echo .)com \
--cc=jbaron@akamai$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
/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