From: Alex Williamson <alex.williamson@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: back merge of Linus' tree into the vfio tree
Date: Thu, 05 Sep 2013 17:14:29 -0600 [thread overview]
Message-ID: <1378422869.3246.282.camel@ul30vt.home> (raw)
In-Reply-To: <20130906090826.947212e7d5383837bff881f5@canb.auug.org.au>
On Fri, 2013-09-06 at 09:08 +1000, Stephen Rothwell wrote:
> Hi Alex,
>
> I noticed that you have back merged Linus' tree into yours. Linus
> usually takes a dim view of that - especially when there is no
> explanation in the merge commit message. i.e. you shouldn't to that
> unless you really need to - and then you should explain why you did it.
Hmm, I was hoping that wouldn't be a problem, especially with no
conflicts in the merge. I did it because the first commit after the
merge in my next tree depends on PCI changes that have already been
merged by Linus. Re-basing is an even bigger sin and I felt it better
to do a merge than ask for two pulls or add an unbuild-able commit to my
next tree. How do you suggest that I resolve this? Thanks,
Alex
next prev parent reply other threads:[~2013-09-05 23:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-05 23:08 linux-next: back merge of Linus' tree into the vfio tree Stephen Rothwell
2013-09-05 23:14 ` Alex Williamson [this message]
2013-09-06 3:31 ` 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=1378422869.3246.282.camel@ul30vt.home \
--to=alex.williamson@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).