linux-kernel - Re: linux-next: manual merge of the kselftest tree with the kselftest-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 03 Dec 2014 22:56:37 +1100
From:	Michael Ellerman <mpe@...erman.id.au>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Shuah Khan <shuahkh@....samsung.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the kselftest tree with the
 kselftest-fixes tree

On Wed, 2014-12-03 at 20:32 +1100, Stephen Rothwell wrote:
> 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.

> 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?

cheers

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/