Re: linux-next: manual merge of the usb tree with Linus' tree

[Felipe Balbi]

On Mon, Dec 06, 2010 at 08:43:58PM -0800, Greg KH wrote:
> On Mon, Dec 06, 2010 at 12:47:18PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/musb/blackfin.c between commit
> > 1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
> > it work") from Linus' tree and commit
> > ea65df57c2eea803535a071752efb030c46a11f5 ("usb: musb: remove board_data
> > parameter from musb_platform_init()") from the usb tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
> Thanks.  Felipe, does this patch look correct?  I should probably merge
> the next -rc release into my USB tree to handle this type of thing.

Looks perfect. Thanks Stephen.

--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/