Re: linux-next: manual merge of the slab tree with the rcu tree

On Thu, Jul 30, 2026 at 10:31:53AM -0700, Paul E. McKenney wrote:
> On Thu, Jul 30, 2026 at 03:38:48PM +0100, Mark Brown wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the slab tree got a conflict in:
> > 
> >   mm/slab_common.c
> > 
> > between commit:
> > 
> >   736084507faa3 ("rcu: Rename struct rcu_gp_oldstate to rcu_gp_seq")
> > 
> > from the rcu tree and commit:
> > 
> >   bdd0cc9f0ffc3 ("mm/slab: introduce struct kvfree_rcu_head for kvfree_rcu batching")
> > 
> > from the slab 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.
> 
> This resolution looks good to me, thank you!
> 
> 							Thanx, Paul
> 

Looks good to me too, thanks!

-- 
Cheers,
Harry / Hyeonggon