linux-kernel - linux-next: manual merge of the percpu tree with the asm-generic tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160927135434.0040b41c@canb.auug.org.au>
Date:   Tue, 27 Sep 2016 13:54:34 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Tejun Heo <tj@...nel.org>, Rusty Russell <rusty@...tcorp.com.au>,
        Christoph Lameter <cl@...ux-foundation.org>,
        Ingo Molnar <mingo@...e.hu>, Arnd Bergmann <arnd@...db.de>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Chunyan Zhang <zhang.chunyan@...aro.org>,
        Nicholas Piggin <npiggin@...il.com>
Subject: linux-next: manual merge of the percpu tree with the asm-generic
 tree

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;								\
  })