From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Darren Hart <dvhart@infradead.org>
Cc: Philippe Coval <philippe.coval@open.eurogiciel.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dmitry Tunin <hanipouspilot@gmail.com>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Date: Wed, 3 Jun 2015 14:04:40 +1000 [thread overview]
Message-ID: <20150603140440.0cc405b5@canb.auug.org.au> (raw)
In-Reply-To: <20150603032750.GA49670@vmdeb7>
[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]
Hi Darren,
On Tue, 2 Jun 2015 20:27:50 -0700 Darren Hart <dvhart@infradead.org> wrote:
>
> Thanks for the heads' up. This happens because my -next branch is based on *-rc1
> as I think was recommended at the last kernel summit. Since rc1 I sent Linus the
> G50-30, but by rc6 I didn't feel good about sending the similar G50-30 fix, so
> that is in my rc1 branch.
>
> I am happy to rebase my -next on rc6 to avoid the conflict, but I believe the
> rebase is considered poor practice.
This is a fairly trivial conflict and Linus will have no trouble fixing
it up as well when he merges your tree in the next window
> You said no action required, but if there is something I can do to avoid this
> kind of manual effort on your part (and a manual merge by Linus in the upcoming
> merge window), I'm happy to update my process to accommodate.
This is fine. git rerere remembers these conflict resolutions for me,
so I only have to fix them once (usually).
For a more complex conflict, you might consider merging the branch that
you had Linus merge (or a later -rc) with, of course, a nice
explanation in the merge commit message, but in this case that would be
overkill.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-06-03 4:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 6:07 linux-next: manual merge of the drivers-x86 tree with Linus' tree Stephen Rothwell
2015-06-03 3:27 ` Darren Hart
2015-06-03 4:04 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-08 2:34 Stephen Rothwell
2024-03-08 2:19 Stephen Rothwell
2024-03-01 3:14 Stephen Rothwell
2024-02-08 1:57 Stephen Rothwell
2024-01-02 2:30 Stephen Rothwell
2018-10-29 3:29 Stephen Rothwell
2018-10-29 9:34 ` Andy Shevchenko
2016-01-15 1:56 Stephen Rothwell
2012-05-31 2:06 Stephen Rothwell
2011-04-08 5:26 Stephen Rothwell
2011-03-24 2:48 Stephen Rothwell
2011-03-24 2:52 ` Matthew Garrett
2010-08-25 1:22 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=20150603140440.0cc405b5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dvhart@infradead.org \
--cc=hanipouspilot@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=philippe.coval@open.eurogiciel.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).