From: "Michał Nazarewicz" <m.nazarewicz@samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Jiri Kosina <jkosina@suse.cz>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Justin P.Mattock" <justinmattock@gmail.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Thomas Weber <weber@corscience.de>,
Mike Frysinger <vapier.adi@gmail.com>
Subject: Re: linux-next: manual merge of the usb tree with Linus' tree
Date: Thu, 05 Aug 2010 12:35:29 +0200 [thread overview]
Message-ID: <op.vgynpf0k7p4s8u@pikus> (raw)
In-Reply-To: <alpine.LNX.2.00.1008051216260.29919@pobox.suse.cz>
On Thu, 05 Aug 2010 12:17:05 +0200, Jiri Kosina <jkosina@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--
next prev parent reply other threads:[~2010-08-05 10:33 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20100805132208.74bf6ab9.sfr@canb.auug.org.au>
2010-08-05 10:17 ` linux-next: manual merge of the usb tree with Linus' tree Jiri Kosina
2010-08-05 10:35 ` Michał Nazarewicz [this message]
2010-08-05 22:36 ` Greg KH
2013-01-21 4:07 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:52 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2011-02-07 4:08 Stephen Rothwell
2011-02-09 2:31 ` Xu, Andiry
2011-02-09 5:42 ` Xu, Andiry
2011-02-17 18:04 ` Greg KH
2010-12-16 3:01 Stephen Rothwell
2010-12-16 3:08 ` Greg KH
2010-12-16 8:05 ` Felipe Balbi
2010-12-16 8:45 ` Felipe Balbi
2010-12-16 15:52 ` Greg KH
2010-12-16 15:55 ` Felipe Balbi
2010-12-16 17:44 ` Greg KH
2010-12-16 18:14 ` Greg KH
2010-12-16 22:33 ` Stephen Rothwell
2010-12-06 1:47 Stephen Rothwell
2010-12-07 4:43 ` Greg KH
2010-12-07 5:49 ` Felipe Balbi
2009-12-23 22:30 Stephen Rothwell
2009-12-23 23:38 ` Greg KH
2009-12-24 0:22 ` Stephen Rothwell
2009-09-23 6:38 Stephen Rothwell
2009-09-23 12:38 ` Jason Wessel
2009-09-23 12:50 ` Stephen Rothwell
2009-09-23 13:20 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=op.vgynpf0k7p4s8u@pikus \
--to=m.nazarewicz@samsung.com \
--cc=greg@kroah.com \
--cc=jkosina@suse.cz \
--cc=justinmattock@gmail.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vapier.adi@gmail.com \
--cc=weber@corscience.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).