From: Michal Marek <mmarek@suse.cz>
To: Kees Cook <keescook@google.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux-Next <linux-next@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Emese Revfy <re.emese@gmail.com>
Subject: Re: linux-next: duplicate patches in the kspp and kbuild trees
Date: Wed, 27 Jul 2016 09:52:16 +0200 [thread overview]
Message-ID: <57986830.50709@suse.cz> (raw)
In-Reply-To: <CAGXu5jLX3Z5dR8Wgf__RC6mptaHsVsizU-st4CDX+3LNaX+o6A@mail.gmail.com>
On 2016-07-27 01:09, Kees Cook wrote:
> On Tue, Jul 26, 2016 at 3:19 PM, Michal Marek <mmarek@suse.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@canb.auug.org.au> wrote:
>>>> Hi Michal,
>>>>
>>>> On Tue, 14 Jun 2016 15:01:42 +0200 Michal Marek <mmarek@suse.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.
I actually send the individual branches of kbuild.git: "kbuild",
"kconfig" and "misc". for-next is just a convenience for linux-next
integration.
Michal
prev parent reply other threads:[~2016-07-27 7:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 23:40 linux-next: duplicate patches in the kspp and kbuild trees Stephen Rothwell
2016-06-13 23:53 ` Kees Cook
2016-06-13 23:57 ` Kees Cook
2016-06-14 4:32 ` Stephen Rothwell
2016-06-14 13:01 ` Michal Marek
2016-06-14 14:13 ` Stephen Rothwell
2016-06-14 16:39 ` Kees Cook
2016-07-26 22:19 ` Michal Marek
2016-07-26 23:09 ` Kees Cook
2016-07-27 7:52 ` Michal Marek [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57986830.50709@suse.cz \
--to=mmarek@suse.cz \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=re.emese@gmail.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.