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:   Fri, 27 May 2022 09:33:54 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Shuah Khan <shuah@kernel.org>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Axel Rasmussen <axelrasmussen@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Shuah Khan <skhan@linuxfoundation.org>,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>,
        Suren Baghdasaryan <surenb@google.com>
Subject: linux-next: manual merge of the kselftest-fixes tree with Linus'
 tree
Message-ID: <20220527093354.27316445@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/obFMnZXiSG7AxV3ULKZ53le";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  tools/testing/selftests/vm/run_vmtests.sh

between commits:

  b67bd551201a ("selftests: vm: refactor run_vmtests.sh to reduce boilerpla=
te")
  33776141b812 ("selftests: vm: add process_mrelease tests")

from Linus' tree and commit:

  e8f0c8965932 ("selftest/vm: add skip support to mremap_test")

from the kselftest-fixes tree.

I fixed it up (I used the former version of this file which seems to have
included 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_/obFMnZXiSG7AxV3ULKZ53le
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKQDmIACgkQAVBC80lX
0GwNEgf+MXNwmAlMGcUwFzrhGXM9SA3cSPweJrRikUq4EiBtip+XowZEfz6AULqh
mAiYBpK+iy7eLyVglrRZnfDj1ZccYzZ2eZv9yHUcEdmr7CklgVyCsY1vWVPNv8OH
DHi+kqgK8U4WP04jDACFK+zhW8sMzRjxcvv4IQxae9/2SxXkmFPqjjvsTcelbHgY
OfidCnqsSk6yTDd5tnGPlFwm6PZD6sn6/CFJu0rD5YbsgSc6znsU+wNpOp5bb1mN
DYlNDRGnM1hxLDts0VDvRSp8Iq2z4YFGg8n1DpBSsyt8RutfYeY9vM3o7Nd9vtDn
le+baFm6wsBTCI+IshXsFcxlIG46MA==
=1Mvw
-----END PGP SIGNATURE-----

--Sig_/obFMnZXiSG7AxV3ULKZ53le--