On Mon, Jun 13, 2016 at 4:53 PM, Kees Cook <keesc...@google.com> wrote: > On Mon, Jun 13, 2016 at 4:40 PM, Stephen Rothwell <s...@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
