From: Russell King <rmk+lkml@arm.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mikael Pettersson <mikpe@it.uu.se>,
James Morris <jmorris@namei.org>,
David Howells <dhowells@redhat.com>
Subject: Re: linux-next: manual merge of the security-testing tree with the arm tree
Date: Mon, 14 Sep 2009 09:12:21 +0100 [thread overview]
Message-ID: <20090914081220.GA14204@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20090914130355.ff26d669.sfr@canb.auug.org.au>
On Mon, Sep 14, 2009 at 01:03:55PM +1000, Stephen Rothwell wrote:
> This is now a conflict between the arm tree and Linus' tree (as the
> security-testing tree has been merged).
That's going to be a problem then - I've sent Linus a pull request last
Saturday, and so my tree is now frozen pending a response from Linus.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2009-09-14 8:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-03 5:47 linux-next: manual merge of the security-testing tree with the arm tree Stephen Rothwell
2009-09-14 3:03 ` Stephen Rothwell
2009-09-14 8:12 ` Russell King [this message]
2009-09-14 8:55 ` Stephen Rothwell
2009-09-14 10:14 ` Russell 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=20090914081220.GA14204@flint.arm.linux.org.uk \
--to=rmk+lkml@arm.linux.org.uk \
--cc=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mikpe@it.uu.se \
--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).