Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1421458
| From | Kees Cook <keescook@google.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: duplicate patches in the kspp and kbuild trees |
| Date | 2016-06-14 02:00 +0200 |
| Message-ID | <rJJVT-554-5@gated-at.bofh.it> (permalink) |
| References | <rJJMd-50f-3@gated-at.bofh.it> <rJJVT-554-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: duplicate patches in the kspp and kbuild trees Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-14 01:50 +0200
Re: linux-next: duplicate patches in the kspp and kbuild trees Kees Cook <keescook@google.com> - 2016-06-14 02:00 +0200
Re: linux-next: duplicate patches in the kspp and kbuild trees Kees Cook <keescook@google.com> - 2016-06-14 02:00 +0200
Re: linux-next: duplicate patches in the kspp and kbuild trees Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-14 06:40 +0200
Re: linux-next: duplicate patches in the kspp and kbuild trees Michal Marek <mmarek@suse.cz> - 2016-06-14 15:10 +0200
Re: linux-next: duplicate patches in the kspp and kbuild trees Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-14 16:20 +0200
Re: linux-next: duplicate patches in the kspp and kbuild trees Kees Cook <keescook@google.com> - 2016-06-14 18:40 +0200
csiph-web