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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 5 Sep 2024 15:41:22 +1000

Hi all,

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

  include/linux/context_tracking.h

between commit:

  593377036e50 ("kvm: Note an RCU quiescent state on guest exit")

from the kvm-fixes tree and commit:

  d65d411c9259 ("treewide: context_tracking: Rename CONTEXT_* into CT_STATE_*")

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/context_tracking.h
index 8a78fabeafc3,d53092ffa9db..000000000000
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@@ -80,12 -80,10 +80,12 @@@ static __always_inline bool context_tra
  	return context_tracking_enabled_this_cpu();
  }
  
 -static __always_inline void context_tracking_guest_exit(void)
 +static __always_inline bool context_tracking_guest_exit(void)
  {
  	if (context_tracking_enabled())
- 		__ct_user_exit(CONTEXT_GUEST);
+ 		__ct_user_exit(CT_STATE_GUEST);
 +
 +	return context_tracking_enabled_this_cpu();
  }
  
  #define CT_WARN_ON(cond) WARN_ON(context_tracking_enabled() && (cond))