lkml.org 
[lkml]   [2016]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: duplicate patches in the kspp and kbuild trees
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.

Sorry for the confusion!

-Kees

--
Kees Cook
Chrome OS & Brillo Security

\
 
 \ /
  Last update: 2016-06-14 02:21    [W:0.191 / U:1.216 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site