linux-kernel - Re: linux-next: duplicate patches in the kspp and kbuild trees

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]

Message-ID: <CAGXu5jLX3Z5dR8Wgf__RC6mptaHsVsizU-st4CDX+3LNaX+o6A@mail.gmail.com>
Date:	Tue, 26 Jul 2016 16:09:45 -0700
From:	Kees Cook <keescook@...gle.com>
To:	Michal Marek <mmarek@...e.cz>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Linux-Next <linux-next@...r.kernel.org>,
	LKML <linux-kernel@...r.kernel.org>,
	Emese Revfy <re.emese@...il.com>
Subject: Re: linux-next: duplicate patches in the kspp and kbuild trees

On Tue, Jul 26, 2016 at 3:19 PM, Michal Marek <mmarek@...e.cz> wrote:
> Dne 14.6.2016 v 18:39 Kees Cook napsal(a):
>> On Tue, Jun 14, 2016 at 7:13 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>>> Hi Michal,
>>>
>>> On Tue, 14 Jun 2016 15:01:42 +0200 Michal Marek <mmarek@...e.cz> wrote:
>>>>
>>>> I won't :). Kees, are you going to keep the patch in your tree and send
>>>> it to Linus once kbuild is in? Or shall I take it (which would
>>>> temporarily result in another duplication...).
>>>
>>> Or Kees could send you a pull request ...
>>
>> My head hurts. :) How about this: since a pull request would (I think)
>> end up pulling the other unrelated kspp patches, how about you take
>> the patch into kbuild, and once it's there, I'll just remove it from
>> my tree (since it's on top).
>
> Sorry, I forgot about this one. It's cherry-picked onto my kbuild branch
> now.

Okay, no worries. I've removed it from my tree and merged your
kbuild/for-next branch into my for-next/kspp branch.

Let me know once you've sent the kbuild/for-next pull request, and I
can follow it up with the the entropy plugin pull request.

Thanks!

-Kees

-- 
Kees Cook
Brillo & Chrome OS Security