From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Rusty Russell <rusty@rustcorp•com.au>,
Christoph Lameter <cl@linux-foundation•org>,
Ingo Molnar <mingo@elte•hu>, Arnd Bergmann <arnd@arndb•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Chunyan Zhang <zhang.chunyan@linaro•org>,
Nicholas Piggin <npiggin@gmail•com>
Subject: linux-next: manual merge of the percpu tree with the asm-generic tree
Date: Tue, 27 Sep 2016 13:54:34 +1000 [thread overview]
Message-ID: <20160927135434.0040b41c@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the percpu tree got a conflict in:
include/asm-generic/percpu.h
between commit:
acbdf0e98066 ("percpu: make this_cpu_generic_read notrace")
from the asm-generic tree and commit:
1b5ca1212742 ("percpu: improve generic percpu modify-return implementation")
from the percpu 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 include/asm-generic/percpu.h
index 70fefec69e61,40e887068da2..000000000000
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
@@@ -108,9 -118,9 +118,9 @@@ do {
#define this_cpu_generic_read(pcp) \
({ \
typeof(pcp) __ret; \
- preempt_disable(); \
+ preempt_disable_notrace(); \
- __ret = *this_cpu_ptr(&(pcp)); \
+ __ret = raw_cpu_generic_read(pcp); \
- preempt_enable(); \
+ preempt_enable_notrace(); \
__ret; \
})
next reply other threads:[~2016-09-27 3:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 3:54 Stephen Rothwell [this message]
2016-09-27 19:59 ` linux-next: manual merge of the percpu tree with the asm-generic tree Arnd Bergmann
2016-09-27 20:01 ` Tejun Heo
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=20160927135434.0040b41c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=cl@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=npiggin@gmail$(echo .)com \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=tj@kernel$(echo .)org \
--cc=zhang.chunyan@linaro$(echo .)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