From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: manual merge of the usb tree with Linus' tree Date: Thu, 5 Aug 2010 15:36:49 -0700 Message-ID: <20100805223649.GD18619@kroah.com> References: <20100805132208.74bf6ab9.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: =?utf-8?Q?Micha=C5=82?= Nazarewicz Cc: Stephen Rothwell , Jiri Kosina , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Justin P.Mattock" , Kyungmin Park , Thomas Weber , Mike Frysinger List-Id: linux-next.vger.kernel.org On Thu, Aug 05, 2010 at 12:35:29PM +0200, Micha=C5=82 Nazarewicz wrote: > On Thu, 05 Aug 2010 12:17:05 +0200, Jiri Kosina wro= te: >=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 br= oken > >>web addresses") from Linus' tree and commit > >>2e73ce9389be011587a0ca581b6798b135e64807 ("USB: gadget: g_ether: up= dated > >>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 cu= rrent > >Linus' tree please? >=20 > It should be enough to add this delta to the "USB: gadget: g_ether: u= pdated > INF file": >=20 > -; http://www.microsoft.com/whdc/hwdev/resources/HWservices/rndis.m= spx > +; http://www.microsoft.com/whdc/device/network/ndis/rmndis.mspx I've fixed this up in my tree now. thanks, greg k-h