Re: linux-next: manual merge of the usb tree with Linus' tree
From: Jiri Kosina <hidden>
Date: 2010-08-05 10:17:12
Also in:
lkml
Possibly related (same subject, not in this thread)
- 2013-01-25 · Re: linux-next: manual merge of the usb tree with Linus' tree · Greg KH <hidden>
- 2013-01-21 · Re: linux-next: manual merge of the usb tree with Linus' tree · Greg KH <hidden>
- 2013-01-21 · linux-next: manual merge of the usb tree with Linus' tree · Stephen Rothwell <hidden>
- 2011-02-17 · Re: linux-next: manual merge of the usb tree with Linus' tree · Greg KH <hidden>
- 2011-02-09 · RE: linux-next: manual merge of the usb tree with Linus' tree · Xu, Andiry <hidden>
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.