From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King Subject: Re: linux-next: manual merge of the security-testing tree with the arm tree Date: Mon, 14 Sep 2009 09:12:21 +0100 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 Return-path: Received: from caramon.arm.linux.org.uk ([78.32.30.218]:56614 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754291AbZINIMe (ORCPT ); Mon, 14 Sep 2009 04:12:34 -0400 Content-Disposition: inline In-Reply-To: <20090914130355.ff26d669.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mikael Pettersson , James Morris , David Howells 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: