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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1509 bytes --]

Hi Jaswinder,

On Wed, 16 Jul 2008 12:36:17 +0530 Jaswinder Singh <jaswinder@infradead.org> wrote:
>
> On Wed, 2008-07-16 at 12:02 +1000, Stephen Rothwell wrote:
> > 
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/serial/io_ti.c between commit
> > d12b219a228efe92f0778ed3af21305e65fbb052 ("edgeport-ti: use
> > request_firmware()") from Linus' tree and commit
> > 1f023570c8d00d3511799ccad21dc3525a6160e1 ("USB: io_ti: FIrst cut at a big
> > clean up") from the usb tree.
> > 
> > This conflict used to be in the firmware tree and my solution then was to
> > remove the commit now in Linus' tree because the fixup was going to take
> > to long.  Now my solution is to remove the commit from the usb tree.
> 
> I am checking linux-next tree :
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git

That is yesterday's linux-next tree, you will need to wait a few hours
before today's tree is available.  Since yesterday, the firmware tree
(include your patch) has been merged into Linus' tree and today's
linux-next is based on that newer version of Linus' tree.

> So I am going to check alan patch manually.
> And after confirmation that alan patch is fully installed then I will
> install firmware patch and send to all of you.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]