[lkml]   [2017]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-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:


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.

Stephen Rothwell

 \ /
  Last update: 2017-06-28 10:32    [W:0.131 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site