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

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

[Stephen Rothwell]

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

Hi all,

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

  tools/testing/selftests/sysctl/sysctl.sh

between commit:

  eee470e0739a ("selftests/sysctl: Fix to load test_sysctl module")

from the kselftest tree and patch:

  "tools/testing/selftests/sysctl/sysctl.sh: support CONFIG_TEST_SYSCTL=y"

from the akpm-current 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/sysctl/sysctl.sh
index c3459f9f2429,ce1eeea6f769..000000000000
--- a/tools/testing/selftests/sysctl/sysctl.sh
+++ b/tools/testing/selftests/sysctl/sysctl.sh
@@@ -112,10 -122,9 +112,10 @@@ test_reqs(
  
  function load_req_mod()
  {
- 	if [ ! -d $DIR ]; then
+ 	if [ ! -d $DIR -a ! -d $SYSCTL ]; then
  		if ! modprobe -q -n $TEST_DRIVER; then
- 			echo "$0: module $TEST_DRIVER not found [SKIP]"
+ 			echo "$0: module $TEST_DRIVER not found and not built-in [SKIP]"
 +			echo "You must set CONFIG_TEST_SYSCTL=m in your kernel" >&2
  			exit $ksft_skip
  		fi
  		modprobe $TEST_DRIVER

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

Re: linux-next: manual merge of the akpm-current tree with the kselftest tree

[Masami Hiramatsu]

Hi Stephen,

On Wed, 3 Jun 2020 18:29:01 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   tools/testing/selftests/sysctl/sysctl.sh
> 
> between commit:
> 
>   eee470e0739a ("selftests/sysctl: Fix to load test_sysctl module")
> 
> from the kselftest tree and patch:
> 
>   "tools/testing/selftests/sysctl/sysctl.sh: support CONFIG_TEST_SYSCTL=y"
> 
> from the akpm-current 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.

Thank you for fixing this confliction, at least this fix looks good to me.
I think this (Vlatimil's patch) should be merged via Shuah's kselftest tree.

https://lkml.org/lkml/2020/4/27/921

This fix seems an independent fix.

Thank you,

> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc tools/testing/selftests/sysctl/sysctl.sh
> index c3459f9f2429,ce1eeea6f769..000000000000
> --- a/tools/testing/selftests/sysctl/sysctl.sh
> +++ b/tools/testing/selftests/sysctl/sysctl.sh
> @@@ -112,10 -122,9 +112,10 @@@ test_reqs(
>   
>   function load_req_mod()
>   {
> - 	if [ ! -d $DIR ]; then
> + 	if [ ! -d $DIR -a ! -d $SYSCTL ]; then
>   		if ! modprobe -q -n $TEST_DRIVER; then
> - 			echo "$0: module $TEST_DRIVER not found [SKIP]"
> + 			echo "$0: module $TEST_DRIVER not found and not built-in [SKIP]"
>  +			echo "You must set CONFIG_TEST_SYSCTL=m in your kernel" >&2
>   			exit $ksft_skip
>   		fi
>   		modprobe $TEST_DRIVER


-- 
Masami Hiramatsu <mhiramat@kernel.org>

Re: linux-next: manual merge of the akpm-current tree with the kselftest tree

[Shuah Khan]

On 6/3/20 4:03 AM, Masami Hiramatsu wrote:
> Hi Stephen,
> 
> On Wed, 3 Jun 2020 18:29:01 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
>> Hi all,
>>
>> Today's linux-next merge of the akpm-current tree got a conflict in:
>>
>>    tools/testing/selftests/sysctl/sysctl.sh
>>
>> between commit:
>>
>>    eee470e0739a ("selftests/sysctl: Fix to load test_sysctl module")
>>
>> from the kselftest tree and patch:
>>
>>    "tools/testing/selftests/sysctl/sysctl.sh: support CONFIG_TEST_SYSCTL=y"
>>
>> from the akpm-current 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.
> 
> Thank you for fixing this confliction, at least this fix looks good to me.
> I think this (Vlatimil's patch) should be merged via Shuah's kselftest tree.
> 
> https://lkml.org/lkml/2020/4/27/921
> 
> This fix seems an independent fix.
> 
> Thank you,
> 
>>
>> -- 
>> Cheers,
>> Stephen Rothwell
>>
>> diff --cc tools/testing/selftests/sysctl/sysctl.sh
>> index c3459f9f2429,ce1eeea6f769..000000000000
>> --- a/tools/testing/selftests/sysctl/sysctl.sh
>> +++ b/tools/testing/selftests/sysctl/sysctl.sh
>> @@@ -112,10 -122,9 +112,10 @@@ test_reqs(
>>    
>>    function load_req_mod()
>>    {
>> - 	if [ ! -d $DIR ]; then
>> + 	if [ ! -d $DIR -a ! -d $SYSCTL ]; then
>>    		if ! modprobe -q -n $TEST_DRIVER; then
>> - 			echo "$0: module $TEST_DRIVER not found [SKIP]"
>> + 			echo "$0: module $TEST_DRIVER not found and not built-in [SKIP]"
>>   +			echo "You must set CONFIG_TEST_SYSCTL=m in your kernel" >&2
>>    			exit $ksft_skip
>>    		fi
>>    		modprobe $TEST_DRIVER
> 
> 

Thanks Stephen for the fixup and Masami for verifying this looks good.
Please carry the fix. I will make a note of the fix in my pull request
to Linus as well to keep us all on the same page.

thanks,
-- Shuah

Re: linux-next: manual merge of the akpm-current tree with the kselftest tree

[Luis R. Rodriguez]

On Thu, Jun 29, 2017 at 12:35:27PM -0700, Andrew Morton wrote:
> On Wed, 28 Jun 2017 18:31:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi all,
> > 
> > Today's linux-next merge of the akpm-current tree got conflicts in:
> > 
> >   tools/testing/selftests/sysctl/common_tests
> >   tools/testing/selftests/sysctl/run_numerictests
> >   tools/testing/selftests/sysctl/run_stringtests
> > 
> > between commit:
> > 
> >   d644437a1dc6 ("tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict")
> > 
> > from the kselftest tree and commit:
> > 
> >   fed7038685f3 ("test_sysctl: add generic script to expand on tests")
> > 
> > from the akpm-current tree.
> > 
> > I fixed it up (I removed the files and so, for now I have effectively
> > dropped the kselftest tree patch) 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.
> > 
> 
> urgh.
> 
> I'll drop 
> 
> test_sysctl-add-dedicated-proc-sysctl-test-driver.patch
> test_sysctl-add-generic-script-to-expand-on-tests.patch
> test_sysctl-test-against-page_size-for-int.patch
> test_sysctl-add-simple-proc_dointvec-case.patch
> test_sysctl-add-simple-proc_douintvec-case.patch
> test_sysctl-test-against-int-proc_dointvec-array-support.patch
> 
> Luis, could you please redo these against the changes in linux-next and
> resend?

Coming right up!

  Luis

Re: linux-next: manual merge of the akpm-current tree with the kselftest tree

[Andrew Morton]

On Wed, 28 Jun 2017 18:31:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got conflicts in:
> 
>   tools/testing/selftests/sysctl/common_tests
>   tools/testing/selftests/sysctl/run_numerictests
>   tools/testing/selftests/sysctl/run_stringtests
> 
> between commit:
> 
>   d644437a1dc6 ("tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict")
> 
> from the kselftest tree and commit:
> 
>   fed7038685f3 ("test_sysctl: add generic script to expand on tests")
> 
> from the akpm-current tree.
> 
> I fixed it up (I removed the files and so, for now I have effectively
> dropped the kselftest tree patch) 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.
> 

urgh.

I'll drop 

test_sysctl-add-dedicated-proc-sysctl-test-driver.patch
test_sysctl-add-generic-script-to-expand-on-tests.patch
test_sysctl-test-against-page_size-for-int.patch
test_sysctl-add-simple-proc_dointvec-case.patch
test_sysctl-add-simple-proc_douintvec-case.patch
test_sysctl-test-against-int-proc_dointvec-array-support.patch

Luis, could you please redo these against the changes in linux-next and
resend?

Thanks.

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the akpm-current tree got conflicts in:

  tools/testing/selftests/sysctl/common_tests
  tools/testing/selftests/sysctl/run_numerictests
  tools/testing/selftests/sysctl/run_stringtests

between commit:

  d644437a1dc6 ("tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict")

from the kselftest tree and commit:

  fed7038685f3 ("test_sysctl: add generic script to expand on tests")

from the akpm-current tree.

I fixed it up (I removed the files and so, for now I have effectively
dropped the kselftest tree patch) 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

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

[Stephen Rothwell]

Hi Andrew,

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

  tools/testing/selftests/vm/run_vmtests

between commit:

  ff80d9152fd7 ("selftests/vm/run_vmtests: Fix wrong comment")

from the kselftest tree and commit:

  7b7c7dac4437 ("userfaultfd: selftest: combine all cases into a single executable")

from the akpm-current 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/run_vmtests
index 2ed05ad00daa,3214a6456d13..000000000000
--- a/tools/testing/selftests/vm/run_vmtests
+++ b/tools/testing/selftests/vm/run_vmtests
@@@ -92,10 -92,10 +92,10 @@@ echo "NOTE: The above hugetlb tests pro
  echo "      https://github.com/libhugetlbfs/libhugetlbfs.git for"
  echo "      hugetlb regression testing."
  
 -echo "--------------------"
 +echo "-------------------"
  echo "running userfaultfd"
 -echo "--------------------"
 +echo "-------------------"
- ./userfaultfd 128 32
+ ./userfaultfd anon 128 32
  if [ $? -ne 0 ]; then
  	echo "[FAIL]"
  	exitcode=1
@@@ -103,11 -103,11 +103,11 @@@ els
  	echo "[PASS]"
  fi
  
 -echo "----------------------------"
 +echo "---------------------------"
  echo "running userfaultfd_hugetlb"
 -echo "----------------------------"
 -# 258MB total huge pages == 128MB src and 128MB dst
 +echo "---------------------------"
 +# 256MB total huge pages == 128MB src and 128MB dst
- ./userfaultfd_hugetlb 128 32 $mnt/ufd_test_file
+ ./userfaultfd hugetlb 128 32 $mnt/ufd_test_file
  if [ $? -ne 0 ]; then
  	echo "[FAIL]"
  	exitcode=1
@@@ -116,10 -116,10 +116,10 @@@ els
  fi
  rm -f $mnt/ufd_test_file
  
 -echo "----------------------------"
 +echo "-------------------------"
  echo "running userfaultfd_shmem"
 -echo "----------------------------"
 +echo "-------------------------"
- ./userfaultfd_shmem 128 32
+ ./userfaultfd shmem 128 32
  if [ $? -ne 0 ]; then
  	echo "[FAIL]"
  	exitcode=1

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

[Stephen Rothwell]

Hi all,

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

  tools/testing/selftests/vm/run_vmtests

between commit:

  2b8713e14be5 ("selftests/vm/run_vmtests: Polish output text")

from the kselftest tree and commit:

  7b7c7dac4437 ("userfaultfd: selftest: combine all cases into a single executable")

from the akpm-current 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/run_vmtests
index 0091bde3f25f,3214a6456d13..000000000000
--- a/tools/testing/selftests/vm/run_vmtests
+++ b/tools/testing/selftests/vm/run_vmtests
@@@ -92,10 -92,10 +92,10 @@@ echo "NOTE: The above hugetlb tests pro
  echo "      https://github.com/libhugetlbfs/libhugetlbfs.git for"
  echo "      hugetlb regression testing."
  
 -echo "--------------------"
 +echo "-------------------"
  echo "running userfaultfd"
 -echo "--------------------"
 +echo "-------------------"
- ./userfaultfd 128 32
+ ./userfaultfd anon 128 32
  if [ $? -ne 0 ]; then
  	echo "[FAIL]"
  	exitcode=1
@@@ -103,11 -103,11 +103,11 @@@ els
  	echo "[PASS]"
  fi
  
 -echo "----------------------------"
 +echo "---------------------------"
  echo "running userfaultfd_hugetlb"
 -echo "----------------------------"
 +echo "---------------------------"
  # 258MB total huge pages == 128MB src and 128MB dst
- ./userfaultfd_hugetlb 128 32 $mnt/ufd_test_file
+ ./userfaultfd hugetlb 128 32 $mnt/ufd_test_file
  if [ $? -ne 0 ]; then
  	echo "[FAIL]"
  	exitcode=1
@@@ -116,10 -116,10 +116,10 @@@ els
  fi
  rm -f $mnt/ufd_test_file
  
 -echo "----------------------------"
 +echo "-------------------------"
  echo "running userfaultfd_shmem"
 -echo "----------------------------"
 +echo "-------------------------"
- ./userfaultfd_shmem 128 32
+ ./userfaultfd shmem 128 32
  if [ $? -ne 0 ]; then
  	echo "[FAIL]"
  	exitcode=1