From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>
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 19:30:23 +1000 [thread overview]
Message-ID: <20110630193023.6056d48e.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20110630072559.GA4048@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
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. :-)
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-06-30 9:30 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 [this message]
2011-06-30 12:17 ` Uwe Kleine-König
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=20110630193023.6056d48e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=git@vger$(echo .)kernel.org \
--cc=jmorris@namei$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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