Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
Date:   Fri, 27 Oct 2023 12:52:26 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Paul Moore <paul@paul-moore.com>, Arnd Bergmann <arnd@arndb.de>
Cc:     Ard Biesheuvel <ardb@kernel.org>,
        Casey Schaufler <casey@schaufler-ca.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 security tree with the asm-generic
 tree
Message-ID: <20231027125226.1ae3d41c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/wK35L_caDVSj5x1VjO5Kon2";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  arch/ia64/kernel/syscalls/syscall.tbl

between commit:

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

from the asm-generic tree and commit:

  6d54f25e4605 ("LSM: wireup Linux Security Module syscalls")

from the security tree.

I fixed it up (I just deleted 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_/wK35L_caDVSj5x1VjO5Kon2
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU7F9oACgkQAVBC80lX
0GzknQf+MxTph56NYMrQUILc5J1ljqH1T1lmfkl9assSznkMZkl/PGH1aYO8c5z9
6gmCST01UwcQK0AeC8iFtuk9Qid4elcjD/rACnBKAb/rX7FPodlP1quu0trRHCoC
MT02mMjbnk9yWA9rAJMvHTcnyj81xPa5N0HkQt1Bpo8480iWq2s7MdHdK39OZa/r
XbkAzlLBv2PGxzIOFFx95n2kPzM3Mx7OATwbZmQXrlsmf1pEkUXnWa9PozR/A9eF
XV2DAxCDS6hIS/qQLwtFY79s9XWoInUrmE0N+ch8ThTo+BwYl4E5nNh3VwL+ydsn
zKo492DoQ5tBxewM0xC0cz/WDcdVkw==
=3ys8
-----END PGP SIGNATURE-----

--Sig_/wK35L_caDVSj5x1VjO5Kon2--