From: Eric Paris <eparis@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the audit tree with Linus' tree
Date: Wed, 16 Apr 2014 08:08:00 -0400 [thread overview]
Message-ID: <1397650080.2725.3.camel@localhost> (raw)
In-Reply-To: <20140416140240.dd99f42196991edcb73a969d@canb.auug.org.au>
On Wed, 2014-04-16 at 14:02 +1000, Stephen Rothwell wrote:
> You could have avoided this by doing a fast forward merge of v3.15-rc1
> instead of the v3.14 merge (since everything in your tree before that
> merge was also in Linus' tree by v3.15-rc1).
This is a situation I've never really known the right way to handle. I
certainly could/can fast forward to 3.15-rc1, but then I have a random
crap development base for the audit tree. Which is especially bad sine
-rc1 doesn't even boot on my main machine.
What I've always done is to merge the last release right after the pull
and go from there, but it clearly leaves conflict potential
Which is preferred? I've always enjoyed having my trees based on a
release....
next prev parent reply other threads:[~2014-04-16 12:08 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-16 4:02 linux-next: manual merge of the audit tree with Linus' tree Stephen Rothwell
2014-04-16 12:08 ` Eric Paris [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-04-08 1:31 Stephen Rothwell
2019-04-08 17:15 ` Dmitry V. Levin
2019-04-08 20:30 ` Paul Moore
2017-03-24 2:18 Stephen Rothwell
2017-03-24 6:33 ` Richard Guy Briggs
2017-03-24 16:39 ` Paul Moore
2017-01-19 2:51 Stephen Rothwell
2017-01-19 4:16 ` Richard Guy Briggs
2016-11-22 5:29 Stephen Rothwell
2016-11-22 10:35 ` Richard Guy Briggs
2016-11-22 21:25 ` Paul Moore
2016-01-19 1:02 Stephen Rothwell
2016-01-19 2:48 ` Paul Moore
2015-11-19 1:06 Stephen Rothwell
2015-11-19 15:53 ` Paul Moore
2015-11-19 18:30 ` Richard Guy Briggs
2015-11-19 20:16 ` Stephen Rothwell
2015-10-06 2:55 Stephen Rothwell
2015-10-06 17:21 ` Paul Moore
2015-08-07 4:15 Stephen Rothwell
2015-08-07 6:33 ` Richard Guy Briggs
2015-06-01 6:30 Stephen Rothwell
2015-06-01 15:59 ` Richard Guy Briggs
2015-01-20 4:04 Stephen Rothwell
2015-01-20 4:04 Stephen Rothwell
2015-01-20 15:45 ` Paul Moore
2015-01-20 4:03 Stephen Rothwell
2014-04-22 3:58 Stephen Rothwell
2014-04-01 4:07 Stephen Rothwell
2014-04-01 12:54 ` Richard Guy Briggs
2014-04-01 13:11 ` Stephen Rothwell
2014-01-15 4:48 Stephen Rothwell
2013-11-06 6:19 Stephen Rothwell
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=1397650080.2725.3.camel@localhost \
--to=eparis@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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).