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

On 6/3/20 4:03 AM, Masami Hiramatsu wrote: Hi Stephen, On Wed, 3 Jun 2020 18:29:01 +1000 Stephen Rothwell 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:

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

Hi Stephen, On Wed, 3 Jun 2020 18:29:01 +1000 Stephen Rothwell 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")

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

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

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

On Thu, Jun 29, 2017 at 12:35:27PM -0700, Andrew Morton wrote: > On Wed, 28 Jun 2017 18:31:11 +1000 Stephen Rothwell > wrote: > > > Hi all, > > > > Today's linux-next merge of the akpm-current tree got conflicts in: > > > > tools/testing/selftests/sysctl/common_tests

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

On Thu, Jun 29, 2017 at 12:35:27PM -0700, Andrew Morton wrote: > On Wed, 28 Jun 2017 18:31:11 +1000 Stephen Rothwell > wrote: > > > Hi all, > > > > Today's linux-next merge of the akpm-current tree got conflicts in: > > > > tools/testing/selftests/sysctl/common_tests > >

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

On Wed, 28 Jun 2017 18:31:11 +1000 Stephen Rothwell 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 >

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

On Wed, 28 Jun 2017 18:31:11 +1000 Stephen Rothwell 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

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

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

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

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

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

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

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

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

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

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

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

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