From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ming Lei <ming.lei@canonical.com>
Subject: Re: linux-next: manual merge of the usb tree with the net-next tree
Date: Mon, 12 Aug 2013 23:22:07 -0700 [thread overview]
Message-ID: <20130813062207.GA23613@kroah.com> (raw)
In-Reply-To: <20130813161359.0613bddf9bbf983253333f30@canb.auug.org.au>
On Tue, Aug 13, 2013 at 04:13:59PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> include/linux/usb/usbnet.h between commit a88c32ae15f2 ("USBNET:
> centralize computing of max rx/tx qlen") from the net-next tree and
> commit 638c5115a794 ("USBNET: support DMA SG") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Yeah, I knew that would happen, it was the easiest way to get these
patches in due to the cross-tree dependancies. The fix looks correct,
thanks.
greg k-h
next prev parent reply other threads:[~2013-08-13 6:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-13 6:13 linux-next: manual merge of the usb tree with the net-next tree Stephen Rothwell
2013-08-13 6:22 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-09 5:19 Stephen Rothwell
2019-08-09 8:53 ` Greg KH
2012-05-21 6:10 Stephen Rothwell
2012-05-21 6:16 ` Kalle Valo
2012-05-21 6:28 ` Stephen Rothwell
2012-05-21 13:08 ` 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=20130813062207.GA23613@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ming.lei@canonical.com \
--cc=sfr@canb.auug.org.au \
/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).