From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Morris <jmorris@namei.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
git@vger.kernel.org, Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the security-testing tree with the tree
Date: Thu, 30 Jun 2011 14:17:10 +0200 [thread overview]
Message-ID: <20110630121710.GJ11559@pengutronix.de> (raw)
In-Reply-To: <20110630193023.6056d48e.sfr@canb.auug.org.au>
On Thu, Jun 30, 2011 at 07:30:23PM +1000, Stephen Rothwell wrote:
> Hi Uwe,
>
> On Thu, 30 Jun 2011 09:25:59 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> >
> > Long history short: James probably used -s ours or similar and it's fine
> > not to merge that commit into next :-)
>
> Ah ha! Thanks for the explanation. My mind was clearly not up to it
> today. :-)
The uncomfortable issue here is that
git show bcd05ca10420
(or gitk or gitweb or <enteryourfavoritetoolhere>) doesn't indicate that
it's "strange". The patch shown is simply empty, as it would be if the
tree matched the other parent or if it were a clean merge.
A flag would be nice that does what I did: redo the merge and compare
bcd05ca10420^{tree} with the result?
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2011-06-30 12:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 4:29 linux-next: manual merge of the security-testing tree with the tree Stephen Rothwell
2011-06-30 4:33 ` Stephen Rothwell
2011-06-30 4:39 ` Stephen Rothwell
2011-06-30 5:22 ` James Morris
2011-06-30 5:53 ` Stephen Rothwell
2011-06-30 7:25 ` Uwe Kleine-König
2011-06-30 9:30 ` Stephen Rothwell
2011-06-30 12:17 ` Uwe Kleine-König [this message]
2011-06-30 16:20 ` Linus Torvalds
2011-06-30 18:52 ` Junio C Hamano
2011-06-30 19:13 ` Jeff King
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=20110630121710.GJ11559@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=git@vger.kernel.org \
--cc=jmorris@namei.org \
--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).