Subject: Re: linux-next: manual merge of the bitmap tree with the arm64 tree

From: Catalin Marinas <[email-masked]>
Date: Mon, 1 Jul 2024 13:47:11 +0100

On Mon, Jul 01, 2024 at 10:07:50AM +0100, Jonathan Cameron wrote:
> On Mon, 1 Jul 2024 17:50:51 +1000
> Stephen Rothwell <[email-masked]> wrote:
> > Today's linux-next merge of the bitmap tree got a conflict in:
> > 
> >   include/linux/cpumask.h
> > 
> > between commit:
> > 
> >   4e1a7df45480 ("cpumask: Add enabled cpumask for present CPUs that can be brought online")
> > 
> > from the arm64 tree and commit:
> > 
> >   5c563ee90a22 ("cpumask: introduce assign_cpu() macro")
> > 
> > from the bitmap tree.
> > 
> > I fixed it up (I just did the obvious - 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.
> 
> Thanks Stephen,
> 
> We can make a similar change to the others in 
>  5c563ee90a22 ("cpumask: introduce assign_cpu() macro")
> but to avoid merge complexity probably easier to just do it next cycle.

We can add a patch at -rc1 once both trees got merged, we do this
occasionally.

-- 
Catalin