Messages in this thread | | | Date | Thu, 5 Aug 2010 12:17:05 +0200 (CEST) | From | Jiri Kosina <> | Subject | Re: linux-next: manual merge of the usb tree with Linus' tree |
| |
On Thu, 5 Aug 2010, Stephen Rothwell wrote:
> Today's linux-next merge of the usb tree got a conflict in > Documentation/usb/linux.inf between commit > 0ea6e61122196509af82cc4f36cbdaacbefb8227 ("Documentation: update broken > web addresses") from Linus' tree and commit > 2e73ce9389be011587a0ca581b6798b135e64807 ("USB: gadget: g_ether: updated > INF file") from the usb tree. > > The URL that was fixed by the former was removed by the latter, so I just > used the latter version.
I see. Greg, will you just rebase the patch in USB tree on top of current Linus' tree please?
Thanks,
-- Jiri Kosina SUSE Labs, Novell Inc.
| |