lkml.org 
[lkml]   [2009]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the security-testing tree with the arm tree
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:


\
 
 \ /
  Last update: 2009-09-14 10:15    [W:0.046 / U:0.788 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site