public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>, Shuah Khan <shuah@kernel•org>
Cc: Joe Perches <joe@perches•com>, John Hubbard <jhubbard@nvidia•com>,
	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 akpm tree with the kselftest-fixes tree
Date: Tue, 6 Oct 2020 22:07:11 +1100	[thread overview]
Message-ID: <20201006220711.0ec49da3@canb.auug.org.au> (raw)

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

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)

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

next             reply	other threads:[~2020-10-06 11:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-06 11:07 Stephen Rothwell [this message]
2020-10-06 18:55 ` linux-next: manual merge of the akpm tree with the kselftest-fixes tree Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201006220711.0ec49da3@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=jhubbard@nvidia$(echo .)com \
    --cc=joe@perches$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=shuah@kernel$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox