Subject: linux-next: manual merge of the rcu tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 9 Oct 2020 15:59:33 +1100

Hi all,

Today's linux-next merge of the rcu tree got a conflict in:

  include/linux/lockdep.h

between commit:

  a046a86082cc ("lockdep: Fix lockdep recursion")

from the tip tree and commit:

  0eb8743dc570 ("lockdep: Cleanup PREEMPT_COUNT leftovers")

from the rcu 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/linux/lockdep.h
index f5594879175a,8555fd128ebf..000000000000
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@@ -580,18 -566,16 +586,16 @@@ do {									
  
  #define lockdep_assert_preemption_enabled()				\
  do {									\
- 	WARN_ON_ONCE(IS_ENABLED(CONFIG_PREEMPT_COUNT)	&&		\
- 		     __lockdep_enabled			&&		\
 -	WARN_ON_ONCE(debug_locks			&&		\
++	WARN_ON_ONCE(__lockdep_enabled			&&		\
  		     (preempt_count() != 0		||		\
 -		      !raw_cpu_read(hardirqs_enabled)));		\
 +		      !this_cpu_read(hardirqs_enabled)));		\
  } while (0)
  
  #define lockdep_assert_preemption_disabled()				\
  do {									\
- 	WARN_ON_ONCE(IS_ENABLED(CONFIG_PREEMPT_COUNT)	&&		\
- 		     __lockdep_enabled			&&		\
 -	WARN_ON_ONCE(debug_locks			&&		\
++	WARN_ON_ONCE(__lockdep_enabled			&&		\
  		     (preempt_count() == 0		&&		\
 -		      raw_cpu_read(hardirqs_enabled)));			\
 +		      this_cpu_read(hardirqs_enabled)));		\
  } while (0)
  
  #else