linux-next: manual merge of the mm tree with the kselftest tree

linux-next: manual merge of the mm tree with the kselftest tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]

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 relative 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.

-- 
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"
  
  struct hmm_buffer {
  	void		*ptr;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]