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@xxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
