On 12/03/2014 07:09 AM, Shuah Khan wrote:

On 12/03/2014 04:56 AM, Michael Ellerman wrote:

quoted

On Wed, 2014-12-03 at 20:32 +1100, Stephen Rothwell wrote:

quoted

Hi Shuah,

Today's linux-next merge of the kselftest tree got a cselftests/kcmp:
Always try to build the testonflict in
tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff ("")
from the kselftest-fixes tree and commit c0d8a9393efd
("selftests/kcmp: add install target to enable installing test") from
the kselftest tree.

That got a bit mixed up, I think it should be:

  Today's linux-next merge of the kselftest tree got a conflict in
  tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff
  ("selftests/kcmp: Always try to build the test") from the kselftest-fixes
  tree and commit c0d8a9393efd ("selftests/kcmp: add install target to enable
  installing test") from the kselftest tree.

quoted

I fixed it up (see below - probably some more could be done) and can
carry the fix as necessary (no action is required).

That resolution basically negates the effect of the first patch.

Shuah, seeing these are both your trees are you happy to do the proper
resolution?

Stephen and Michael,

I will sort this out. I have some patches in next that I should have
cleaned up yesterday when I applied commit 4c12df63f7ff.

Sorry for the mix-up

Done. kselftes-next is clean now.

-- Shuah

-- 
Shuah Khan
Sr. Linux Kernel Developer
Samsung Research America (Silicon Valley)
shuahkh@osg.samsung.com | (970) 217-8978