Date: Mon, 14 Sep 2009 09:12:21 +0100
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
Message-ID: <20090914081220.GA14204@flint.arm.linux.org.uk>
References: <20090903154700.2d4538cf.sfr@canb.auug.org.au> <20090914130355.ff26d669.sfr@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20090914130355.ff26d669.sfr@canb.auug.org.au>
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 664
Lines: 16

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:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/