Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Date:   Mon, 25 Sep 2023 15:51:31 +0200
From:   Joel Granados <j.granados@samsung.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
CC:     Luis Chamberlain <mcgrof@kernel.org>,
        Arnd Bergmann <arnd@arndb.de>,
        Ard Biesheuvel <ardb@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the sysctl tree with the
 asm-generic tree
Message-ID: <20230925135131.6nbgnahnlm2vttc4@localhost>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg="pgp-sha512";
        protocol="application/pgp-signature"; boundary="qxu3dkszgsgmsktm"
Content-Disposition: inline
In-Reply-To: <20230921115034.5461f62f@canb.auug.org.au>
CMS-TYPE: 201P
References: <CGME20230921015042eucas1p1f8658fd99d9e7befc3926bb71d917c86@eucas1p1.samsung.com>
        <20230921115034.5461f62f@canb.auug.org.au>
Precedence: bulk

--qxu3dkszgsgmsktm
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Sep 21, 2023 at 11:50:34AM +1000, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the sysctl tree got a conflict in:
>=20
>   arch/ia64/kernel/crash.c
>=20
> between commit:
>=20
>   cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
>=20
> from the asm-generic tree and commit:
>=20
>   d2f2ef357794 ("ia64: Remove now superfluous sentinel element from ctl_t=
able array")
This is part of the sysctl work to remove sentinel. I wont take any
actio as Luis has already removed it.

Best

>=20
> from the sysctl tree.
>=20
> 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
> --=20
> Cheers,
> Stephen Rothwell


--=20

Joel Granados

--qxu3dkszgsgmsktm
Content-Type: application/pgp-signature; name="signature.asc"

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

iQGzBAABCgAdFiEErkcJVyXmMSXOyyeQupfNUreWQU8FAmURkGMACgkQupfNUreW
QU9xcwwAjJUpi9vqmuyGpjFq95neNtVUwpYtVXBHHWpMXmcQw/TJf2KKjrhqxsua
3vvST1I2YCNPzZfT7tJsUOd5wnGJnd+0EO2lZNMwyOPgZ2oftkdUZ5963XqWb6jW
KXW06FHpLybw2hFicj6bm2MRDL2PorxKXJBppayjhsuCGi+sRv3f6vEpDZwINp9S
XSyz9u56jAiITD31EgzYE6oz/S/XgVuUbkVX9IgdDrq0wJBz3B4smNl9YuEaKuXL
crkDSXQlRMvBMgYOK0vvINNJnHNwOvE8ekEHiz6gRbWSIIRUm+Q9B73dzCs/Fzkh
pIuV1wrN5zY02hObRA9cTTwKkewOGweQBF41eC/qRfgwSQjtQi5QkgsarNuW+ro3
bmfPjQUZESVyDuFC9HRF9o/N2dE2NBf7l6l4p/SVXD3tuwMXdDJeInSGANbMfpnb
veOZK30PL1UTqXHttJEs71tywIFduvlTP16OhtrmAJCBggzaUWNWgkViHi69XBQg
45GCuh1u
=uRHJ
-----END PGP SIGNATURE-----

--qxu3dkszgsgmsktm--