From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@google.com>
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: Tue, 14 Jun 2016 14:32:03 +1000 [thread overview]
Message-ID: <20160614143203.220d0722@canb.auug.org.au> (raw)
In-Reply-To: <CAGXu5jJK25pMi1kG2vUfWkZkDBxCVeLUVs61a=m8qmHDTjPg9g@mail.gmail.com>
Hi Kees,
On Mon, 13 Jun 2016 16:57:15 -0700 Kees Cook <keescook@google.com> wrote:
>
> On Mon, Jun 13, 2016 at 4:53 PM, Kees Cook <keescook@google.com> wrote:
> >
> > 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.
Cherry-picking produces new commits (with new SHA1s etc), while merging
(or rebasing on top of the other versions) will have the same commits
(not just patches).
Having the same commits means that they never produce conflicts after
further changes to the same files (unless both sides of the merge make
further changes to the same files).
> I've done this merge correctly now and pushed a forced update on the kspp tree.
Thanks for that. Now you just have to hope that Michal never rebases
that part of his tree from under you. (Michal: hint! :-))
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-06-14 4:32 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 [this message]
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=20160614143203.220d0722@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=re.emese@gmail.com \
/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).