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

From: Kees Cook
Date: Tue Jul 26 2016 - 19:09:52 EST

On Tue, Jul 26, 2016 at 3:19 PM, Michal Marek <mmarek@xxxxxxx> wrote:
> Dne 14.6.2016 v 18:39 Kees Cook napsal(a):
>> On Tue, Jun 14, 2016 at 7:13 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>>> Hi Michal,
>>> On Tue, 14 Jun 2016 15:01:42 +0200 Michal Marek <mmarek@xxxxxxx> 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.



Kees Cook
Brillo & Chrome OS Security