Received-SPF: pass (google.com: domain of linux-kernel+bounces-210732-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Wed, 12 Jun 2024 10:32:35 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Yury Norov <yury.norov@gmail.com>
Subject: Re: linux-next: manual merge of the input tree with the mm tree
Message-ID: <20240612103235.5ef64950@canb.auug.org.au>
In-Reply-To: <8734po1mel.ffs@tglx>
References: <20240607102417.2cc20b04@canb.auug.org.au>
	<8734po1mel.ffs@tglx>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/82LLhKze6Bg.FPkMCHT8=r0";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/82LLhKze6Bg.FPkMCHT8=r0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 07 Jun 2024 23:19:14 +0200 Thomas Gleixner <tglx@linutronix.de> wro=
te:
>
> On Fri, Jun 07 2024 at 10:24, Stephen Rothwell wrote:
>=20
> > 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 w=
here possible")
> >
> > from the mm-noonmm-unstable branch of the mm tree and commit:
> >
> >   c76494768761 ("linux/interrupt.h: allow "guard" notation to disable a=
nd 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. =20
>=20
> Dmitry has this commit tagged for tip tree consumption. I take care of
> that tomorrow.

The resolution is now as below.

--=20
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 @@@
 =20
  #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>

--Sig_/82LLhKze6Bg.FPkMCHT8=r0
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZo7KMACgkQAVBC80lX
0Gw7Qwf/XEF4qYZRPzKU3IhkZgmyTwof57C8DWohbaQ0HwrLESQDEmJHgaMA01DB
aRa+THmoDOmphlGpLI88frUKlDeTHcRiq1T69XzM3w9P5ifhuSFcHgx7PrIXhLds
LUKWHnWZixhJd1RTDIqX4oHuNTFkawpkopqq5uOHvb45n4L/wTcQ6k0/hauo+FRj
niT5Getm8niEU66ThouSyNa6G93XfVnBaUN++3u0T6cwVBa8vUyuaBo+d6wymbsF
zezTyyY6dp14L/LpujkkuRx90VKYpFOcCkKskon6bKNxWirnJ8SkZsUxDcg3Jtj+
+vTbBHui2gc0qlvSKFqRDxNFLcWzoA==
=yz8b
-----END PGP SIGNATURE-----

--Sig_/82LLhKze6Bg.FPkMCHT8=r0--