linux-next: manual merge of the input tree with the mm tree

linux-next: manual merge of the input tree with the mm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

Hi all,

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

  include/linux/interrupt.h

between commit:

  2156d61a07d9 ("cpumask: make core headers including cpumask_types.h where possible")

from the mm-noonmm-unstable branch of the mm tree and commit:

  c76494768761 ("linux/interrupt.h: allow "guard" notation to disable and reenable IRQ")

from the input 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/interrupt.h
index da88261f4748,3a36e64119c8..000000000000
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@@ -5,7 -5,8 +5,8 @@@
  
  #include <linux/kernel.h>
  #include <linux/bitops.h>
+ #include <linux/cleanup.h>
 -#include <linux/cpumask.h>
 +#include <linux/cpumask_types.h>
  #include <linux/irqreturn.h>
  #include <linux/irqnr.h>
  #include <linux/hardirq.h>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the input tree with the mm tree

[Thomas Gleixner]

On Fri, Jun 07 2024 at 10:24, Stephen Rothwell wrote:

> Hi all,
>
> Today's linux-next merge of the input tree got a conflict in:
>
>   include/linux/interrupt.h
>
> between commit:
>
>   2156d61a07d9 ("cpumask: make core headers including cpumask_types.h where possible")
>
> from the mm-noonmm-unstable branch of the mm tree and commit:
>
>   c76494768761 ("linux/interrupt.h: allow "guard" notation to disable and reenable IRQ")
>
> from the input 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.

Dmitry has this commit tagged for tip tree consumption. I take care of
that tomorrow.

Thanks,

        tglx

Re: linux-next: manual merge of the input tree with the mm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]

Hi all,

On Fri, 07 Jun 2024 23:19:14 +0200 Thomas Gleixner <tglx@linutronix.de> wrote:
>
> On Fri, Jun 07 2024 at 10:24, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the input tree got a conflict in:
> >
> >   include/linux/interrupt.h
> >
> > between commit:
> >
> >   2156d61a07d9 ("cpumask: make core headers including cpumask_types.h where possible")
> >
> > from the mm-noonmm-unstable branch of the mm tree and commit:
> >
> >   c76494768761 ("linux/interrupt.h: allow "guard" notation to disable and reenable IRQ")
> >
> > from the input 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.  
> 
> Dmitry has this commit tagged for tip tree consumption. I take care of
> that tomorrow.

The resolution is now as below.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/interrupt.h
index 136a55455529,3a36e64119c8..000000000000
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@@ -5,6 -5,8 +5,7 @@@
  
  #include <linux/kernel.h>
  #include <linux/bitops.h>
+ #include <linux/cleanup.h>
 -#include <linux/cpumask.h>
  #include <linux/irqreturn.h>
  #include <linux/irqnr.h>
  #include <linux/hardirq.h>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]