Received-SPF: pass (google.com: domain of linux-kernel+bounces-205184-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Fri, 7 Jun 2024 10:24:17 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: 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: linux-next: manual merge of the input tree with the mm tree
Message-ID: <20240607102417.2cc20b04@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/9z_3V_ee2UclbIre0+ebrm6";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/9z_3V_ee2UclbIre0+ebrm6
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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

--Sig_/9z_3V_ee2UclbIre0+ebrm6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZiUzEACgkQAVBC80lX
0Gwmmwf/bY8ABZl0TAPgj9oqHCH6v7HQYKy/A21ntSkFeHPj4IIJ1YGa0Z8JaL3h
FiYVV/qh8pD182KB4Py8TlV1ItvC9Ig2aulLf4DroDbkga5T5PYCyilOQ7YsX55n
y/rf3tnw+wWrnuxjD7QALGM+b95Ple9E2UCVaUdqiyMvtBFyYK8GgFYKHO/a5i4M
UZ7BCZrR0HKIj/G7PmZrqQK58fCzOI0jfPTOc2w3tkNsoqQwGz3c8F5ahsl8L/EK
VvlIyoFCuSo+2kSj0pz1nmkNgT+f77XU67/uhftOs79/MjGZY8jqc25A6dx5Db0L
9n8dwQGMIFCpCfcDtFa/X8sRRfslGg==
=ASyF
-----END PGP SIGNATURE-----

--Sig_/9z_3V_ee2UclbIre0+ebrm6--