Messages in this thread | | | Date | Mon, 14 Sep 2009 09:12:21 +0100 | From | Russell King <> | Subject | Re: 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:
| |