From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760100Ab0HEKd7 (ORCPT ); Thu, 5 Aug 2010 06:33:59 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:46893 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752995Ab0HEKd5 convert rfc822-to-8bit (ORCPT ); Thu, 5 Aug 2010 06:33:57 -0400 MIME-version: 1.0 Content-type: text/plain; charset=utf-8; format=flowed; delsp=yes Date: Thu, 05 Aug 2010 12:35:29 +0200 From: =?utf-8?B?TWljaGHFgiBOYXphcmV3aWN6?= Subject: Re: linux-next: manual merge of the usb tree with Linus' tree In-reply-to: To: Stephen Rothwell , Jiri Kosina Cc: Greg KH , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Justin P.Mattock" , Kyungmin Park , Thomas Weber , Mike Frysinger Message-id: Organization: Samsung Electronics Content-transfer-encoding: 8BIT User-Agent: Opera Mail/10.60 (Linux) References: <20100805132208.74bf6ab9.sfr@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 05 Aug 2010 12:17:05 +0200, Jiri Kosina 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--