From: Kees Cook <keescook@google.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Michal Marek <mmarek@suse.cz>,
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: Mon, 13 Jun 2016 16:57:15 -0700 [thread overview]
Message-ID: <CAGXu5jJK25pMi1kG2vUfWkZkDBxCVeLUVs61a=m8qmHDTjPg9g@mail.gmail.com> (raw)
In-Reply-To: <CAGXu5jLh7gXMcdU=F0qWc1S61YX-QmfQHpUfb+sxkQLUXu1Hqw@mail.gmail.com>
On Mon, Jun 13, 2016 at 4:53 PM, Kees Cook <keescook@google.com> wrote:
> On Mon, Jun 13, 2016 at 4:40 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi Kees,
>>
>> As of today, there are four duplicate patches (different commits)
>> in the kspp and kbuild trees.
>>
>> Shared library support
>> GCC plugin infrastructure
>> Add Cyclomatic complexity GCC plugin
>> Add sancov plugin
>>
>> are in both trees as different commits :-( They have been in the kbuild
>> tree for a couple of days already. One of you should be merging the
>> other's branch, or you both should be mergeing a common branch.
>>
>> Also, Kees, the versions in your tree do not have your Signed-off-by
>> (but do have Michal's).
>
> Strange, I pulled these directly from linux-next. Michal had an
> auto-responder saying he was going to be out-of-office, so I wanted to
> make sure the !COMPILE_TEST fix got in.
>
> Sounds like I should merge the kbuild tree, rather than cherry-picking
> from linux-next? I will adjust.
I've done this merge correctly now and pushed a forced update on the kspp tree.
-Kees
>
> Sorry for the confusion!
>
> -Kees
>
> --
> Kees Cook
> Chrome OS & Brillo Security
--
Kees Cook
Chrome OS & Brillo Security
next prev parent reply other threads:[~2016-06-13 23:57 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 [this message]
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
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='CAGXu5jJK25pMi1kG2vUfWkZkDBxCVeLUVs61a=m8qmHDTjPg9g@mail.gmail.com' \
--to=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mmarek@suse.cz \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).