* linux-next: manual merge of the akpm tree with the kselftest-fixes tree
@ 2020-10-06 11:07 Stephen Rothwell
2020-10-06 18:55 ` Shuah Khan
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-10-06 11:07 UTC (permalink / raw)
To: Andrew Morton, Shuah Khan
Cc: Joe Perches, John Hubbard, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the kselftest-fixes tree
2020-10-06 11:07 linux-next: manual merge of the akpm tree with the kselftest-fixes tree Stephen Rothwell
@ 2020-10-06 18:55 ` Shuah Khan
0 siblings, 0 replies; 2+ messages in thread
From: Shuah Khan @ 2020-10-06 18:55 UTC (permalink / raw)
To: Stephen Rothwell, Andrew Morton, Shuah Khan
Cc: Joe Perches, John Hubbard, Linux Kernel Mailing List,
Linux Next Mailing List, Shuah Khan
On 10/6/20 5:07 AM, Stephen Rothwell wrote:
> 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.
>
Hi Stephen,
Thanks for fixing it. I will mention it in my pull request to Linus
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-06 18:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-06 11:07 linux-next: manual merge of the akpm tree with the kselftest-fixes tree Stephen Rothwell
2020-10-06 18:55 ` Shuah Khan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox