Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 28 Feb 2022 11:45:23 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Helge Deller <deller@gmx.de>,
        Parisc List <linux-parisc@vger.kernel.org>,
        Arnd Bergmann <arnd@arndb.de>
Cc:     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 parisc-hd tree with the asm-generic
 tree
Message-ID: <20220228114523.03b2f921@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/env_jC=hHeghxkPdsvWNmCI";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  arch/parisc/lib/memcpy.c

between commit:

  967747bbc084 ("uaccess: remove CONFIG_SET_FS")

from the asm-generic tree and commit:

  d4a767ea8b0e ("parisc: Use constants to encode the space registers like S=
R_KERNEL")

from the parisc-hd tree.

I fixed it up (I just used the latter) 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_/env_jC=hHeghxkPdsvWNmCI
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIcGyMACgkQAVBC80lX
0GzlAgf/Y+T9OD9bA/CjKlAT2MmZvVmr6WUxoHdvl/nMGtPJwGhmzTEcwoQh/5BV
S5H/M4fZSFaFJa7ky2prbwM4kvQYNnZvPku9RTDI7AKKNX1aLS2A2zjo6TPkRfrn
4ECamNmBox2Qvp/BFwMLjutvGTOVReaGVEPTp7pa+LlAOOC8V/cfdAQZKxY77dmh
GijSl/iz8MnCO8tLpTJzGzvaz3bXaHhVcP7S+NIfJnbwn/ZqJeS3tNVymp1lldnF
ZpLcGi091OYwqVRKaiYLB9lc1Ou6gydrD9xxWuFEim6kXX5mCUG/7Gz0g4cnVOA1
xoiyRWs8oXW4YNfqLeMp8BfO6sty1w==
=Epxv
-----END PGP SIGNATURE-----

--Sig_/env_jC=hHeghxkPdsvWNmCI--