linux-next: manual merge of the usb tree with Linus' tree
in [Kernel]
|
Prev: [PATCH 4/4 -mm][memcg] generic file-stat accounting interface for memcg
Next: NET_NS: unregister_netdevice: waiting for lo to become free (after using openvpn)
From: Jiri Kosina on 5 Aug 2010 06:20 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Michał Nazarewicz on 5 Aug 2010 06:40 On Thu, 05 Aug 2010 12:17:05 +0200, Jiri Kosina <jkosina(a)suse.cz> 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-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 5 Aug 2010 18:40
On Thu, Aug 05, 2010 at 12:35:29PM +0200, Michał Nazarewicz wrote: > On Thu, 05 Aug 2010 12:17:05 +0200, Jiri Kosina <jkosina(a)suse.cz> 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 I've fixed this up in my tree now. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |