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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  kernel/kcsan/core.c
  kernel/kcsan/encoding.h

between commit:

  5cbaefe9743b ("kcsan: Improve various small stylistic details")

from the tip tree and commit:

  b524b53678c6 ("kcsan: Prefer __always_inline for fast-path")

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 kernel/kcsan/core.c
index 3314fc29e236,69870645b631..000000000000
--- a/kernel/kcsan/core.c
+++ b/kernel/kcsan/core.c
@@@ -78,10 -78,8 +78,10 @@@ static atomic_long_t watchpoints[CONFIG
   */
  static DEFINE_PER_CPU(long, kcsan_skip);
  
- static inline atomic_long_t *find_watchpoint(unsigned long addr,
- 					     size_t size,
- 					     bool expect_write,
- 					     long *encoded_watchpoint)
 -static __always_inline atomic_long_t *
 -find_watchpoint(unsigned long addr, size_t size, bool expect_write, long *encoded_watchpoint)
++static __always_inline atomic_long_t *find_watchpoint(unsigned long addr,
++						      size_t size,
++						      bool expect_write,
++						      long *encoded_watchpoint)
  {
  	const int slot = watchpoint_slot(addr);
  	const unsigned long addr_masked = addr & WATCHPOINT_ADDR_MASK;
@@@ -146,10 -149,11 +146,10 @@@ insert_watchpoint(unsigned long addr, s
   *	2. the thread that set up the watchpoint already removed it;
   *	3. the watchpoint was removed and then re-used.
   */
- static inline bool
+ static __always_inline bool
  try_consume_watchpoint(atomic_long_t *watchpoint, long encoded_watchpoint)
  {
 -	return atomic_long_try_cmpxchg_relaxed(watchpoint, &encoded_watchpoint,
 -					       CONSUMED_WATCHPOINT);
 +	return atomic_long_try_cmpxchg_relaxed(watchpoint, &encoded_watchpoint, CONSUMED_WATCHPOINT);
  }
  
  /*
@@@ -157,13 -161,14 +157,13 @@@
   */
  static inline bool remove_watchpoint(atomic_long_t *watchpoint)
  {
 -	return atomic_long_xchg_relaxed(watchpoint, INVALID_WATCHPOINT) !=
 -	       CONSUMED_WATCHPOINT;
 +	return atomic_long_xchg_relaxed(watchpoint, INVALID_WATCHPOINT) != CONSUMED_WATCHPOINT;
  }
  
- static inline struct kcsan_ctx *get_ctx(void)
+ static __always_inline struct kcsan_ctx *get_ctx(void)
  {
  	/*
 -	 * In interrupt, use raw_cpu_ptr to avoid unnecessary checks, that would
 +	 * In interrupts, use raw_cpu_ptr to avoid unnecessary checks, that would
  	 * also result in calls that generate warnings in uaccess regions.
  	 */
  	return in_task() ? &current->kcsan_ctx : raw_cpu_ptr(&kcsan_cpu_ctx);
diff --cc kernel/kcsan/encoding.h
index b63890e86449,e527e83ce825..000000000000
--- a/kernel/kcsan/encoding.h
+++ b/kernel/kcsan/encoding.h
@@@ -59,10 -58,8 +59,10 @@@ encode_watchpoint(unsigned long addr, s
  		      (addr & WATCHPOINT_ADDR_MASK));
  }
  
- static inline bool decode_watchpoint(long watchpoint,
- 				     unsigned long *addr_masked,
- 				     size_t *size,
- 				     bool *is_write)
 -static __always_inline bool
 -decode_watchpoint(long watchpoint, unsigned long *addr_masked, size_t *size, bool *is_write)
++static __always_inline bool decode_watchpoint(long watchpoint,
++					      unsigned long *addr_masked,
++					      size_t *size,
++					      bool *is_write)
  {
  	if (watchpoint == INVALID_WATCHPOINT ||
  	    watchpoint == CONSUMED_WATCHPOINT)

Attachment: pgpJv3zubKH4V.pgp
Description: OpenPGP digital signature