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:   Thu, 15 Sep 2022 16:33:01 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Shuah Khan <shuah@kernel.org>
Cc:     Alistair Popple <apopple@nvidia.com>,
        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>
Subject: linux-next: manual merge of the mm tree with the kselftest tree
Message-ID: <20220915163301.1c8803bc@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/yca8PNeg1hzOn6qyYHw=22U";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  tools/testing/selftests/vm/hmm-tests.c

between commit:

  ab7039dbcc61 ("selftests/vm: use top_srcdir instead of recomputing relati=
ve paths")

from the kselftest tree and commit:

  223e3150a0d8 ("hmm-tests: fix migrate_dirty_page test")

from the mm tree.

I fixed it up (see below) 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

diff --cc tools/testing/selftests/vm/hmm-tests.c
index 7d722265dcd7,96eb73f37904..000000000000
--- a/tools/testing/selftests/vm/hmm-tests.c
+++ b/tools/testing/selftests/vm/hmm-tests.c
@@@ -31,8 -31,9 +31,9 @@@
   * This is a private UAPI to the kernel test module so it isn't exported
   * in the usual include/uapi/... directory.
   */
 -#include "../../../../lib/test_hmm_uapi.h"
 -#include "../../../../mm/gup_test.h"
 +#include <lib/test_hmm_uapi.h>
 +#include <mm/gup_test.h>
+ #include "vm_util.h"
 =20
  struct hmm_buffer {
  	void		*ptr;

--Sig_/yca8PNeg1hzOn6qyYHw=22U
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMixx0ACgkQAVBC80lX
0GzOmAf/Z/qdfb0WQt9V/j5/HHy5XrgAQ/hTAxmcOoWNEEVopAhgagX3SRfdmGo2
bQBRFO6v2PwdiQBInotRIWswg5lkOzgnQW6nz65hPIP6+mrIAkHlHa10mJDbP6u3
wIpvJ7IRgvpw+oYl7PoVWgjEoqpUrzwS/hln5tdNNFQo1oB0p8wm7gGBtcB6q3pB
cv1FhNzhZQMQynShvoGaUMlIk7Q2aUhouoN99QncAE+sV12XQ5Yk0dTlI0LG20QH
Dx3Uql72IGY5yhtd3FETbltWm4lVOsSVbMtkGf+b/VxLzfeADY5QctzJ3zRHn6ln
agZoTaDqSiLSQiv1ED4CcnADgmeCCA==
=713r
-----END PGP SIGNATURE-----

--Sig_/yca8PNeg1hzOn6qyYHw=22U--