Subject: Re: linux-next: manual merge of the usb tree

From: Jaswinder Singh <[email-masked]>
Date: Wed, 16 Jul 2008 12:50:08 +0530

Hello Stephen,

On Wed, 2008-07-16 at 17:13 +1000, Stephen Rothwell wrote:

> What needs to happen is that Alan's patch needs to be redone based on
> Linus' tree of today.
> 

My patch is smaller and simpler as compare to Alan patch.

So can we follow this approach for linux-next tree:-

1. Remove my patch from Linus tree
2. Apply Alan patch first
3. Then I will give you firmware patch based upon yesterday tree which I
installed here :-
http://git.infradead.org/users/jaswinder/linux-next.git
4. Then you apply firmware patch

Thank you,

Jaswinder Singh.