Subject: linux-next: manual merge of the akpm tree with the kselftest-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 6 Oct 2020 22:07:11 +1100

Hi all,

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

  tools/testing/selftests/vm/gup_test.c

between commit:

  aa803771a80a ("tools: Avoid comma separated statements")

from the kselftest-fixes tree and commit:

  5c64830675a6 ("mm/gup_benchmark: rename to mm/gup_test")

from the akpm 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/gup_test.c
index 1d4359341e44,e930135727a2..000000000000
--- a/tools/testing/selftests/vm/gup_test.c
+++ b/tools/testing/selftests/vm/gup_test.c
@@@ -104,17 -104,13 +104,17 @@@ int main(int argc, char **argv
  	if (write)
  		gup.flags |= FOLL_WRITE;
  
- 	fd = open("/sys/kernel/debug/gup_benchmark", O_RDWR);
+ 	fd = open("/sys/kernel/debug/gup_test", O_RDWR);
 -	if (fd == -1)
 -		perror("open"), exit(1);
 +	if (fd == -1) {
 +		perror("open");
 +		exit(1);
 +	}
  
  	p = mmap(NULL, size, PROT_READ | PROT_WRITE, flags, filed, 0);
 -	if (p == MAP_FAILED)
 -		perror("mmap"), exit(1);
 +	if (p == MAP_FAILED) {
 +		perror("mmap");
 +		exit(1);
 +	}
  	gup.addr = (unsigned long)p;
  
  	if (thp == 1)