Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1678125

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

Show all headers | View raw

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.

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the akpm-current tree with the  kselftest tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-28 10:40 +0200
  Re: linux-next: manual merge of the akpm-current tree with the  kselftest tree Andrew Morton <akpm@linux-foundation.org> - 2017-06-29 21:40 +0200
    [PATCH v2 6/6] test_sysctl: test against int proc_dointvec() array support "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-07-01 00:50 +0200
    [PATCH v2 1/6] test_sysctl: add dedicated proc sysctl test driver "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-07-01 00:50 +0200
    [PATCH v2 0/6] test_sysctl: fix up merge conflicts "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-07-01 00:50 +0200
      [PATCH v2 5/6] test_sysctl: add simple proc_douintvec() case "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-07-01 00:50 +0200
      [PATCH v2 4/6] test_sysctl: add simple proc_dointvec() case "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-07-01 00:50 +0200
      [PATCH v2 3/6] test_sysctl: test against PAGE_SIZE for int "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-07-01 00:50 +0200
      [PATCH v2 2/6] test_sysctl: add generic script to expand on tests "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-07-01 00:50 +0200
    Re: linux-next: manual merge of the akpm-current tree with the  kselftest tree "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-07-01 00:50 +0200

csiph-web