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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, 05 Aug 2010 12:17:05 +0200, Jiri Kosina <jkosina@xxxxxxx> wrote:

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?

It should be enough to add this delta to the "USB: gadget: g_ether: updated
INF file":

-;   http://www.microsoft.com/whdc/hwdev/resources/HWservices/rndis.mspx
+;   http://www.microsoft.com/whdc/device/network/ndis/rmndis.mspx

--
Best regards,                                        _     _
| Humble Liege of Serenely Enlightened Majesty of  o' \,=./ `o
| Computer Science,  Michał "mina86" Nazarewicz       (o o)
+----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux