Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Date:   Thu, 21 Sep 2023 11:50:34 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Luis Chamberlain <mcgrof@kernel.org>, Arnd Bergmann <arnd@arndb.de>
Cc:     Ard Biesheuvel <ardb@kernel.org>,
        Joel Granados <j.granados@samsung.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the sysctl tree with the asm-generic
 tree
Message-ID: <20230921115034.5461f62f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/abOGJuyUxkoxwYZBACpOO4O";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/abOGJuyUxkoxwYZBACpOO4O
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/ia64/kernel/crash.c

between commit:

  cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")

from the asm-generic tree and commit:

  d2f2ef357794 ("ia64: Remove now superfluous sentinel element from ctl_tab=
le array")

from the sysctl tree.

I fixed it up (I removed the file) 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

--Sig_/abOGJuyUxkoxwYZBACpOO4O
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmULoWoACgkQAVBC80lX
0Gx7PQf/TzOjUUFn+I6C5fLjeElNvtz83wRWweZuJplE2Skv3+mjLk5APK7sdXBI
e1C69jKE0BbOdmn7j1FznpFCMIbNbqUlQOGmDt/1/xJx7LWtm+2sVLBXe2oFSzYP
JaORSbAjb8MWFN1DGUAPJQu5Cz0F5Knrg5HYVWYAxjVXJIzR+iXkcR1O4tx/15k6
DqJtzuxMOG+f4wsKJOYCr20YWIb4kUWTV3savYhQ5Fu/dds2uX/SDEuPIOPijLmM
6g0ZnAFiT86Dhqq8CmW2VFeJFBAcQsslGXzeJ+8sWxM1fye8jpSiOH/KIVjM5RMd
fp4yzvZK5pn6rXeaydhvfw/DNgyG9w==
=7zyq
-----END PGP SIGNATURE-----

--Sig_/abOGJuyUxkoxwYZBACpOO4O--