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,
Wolfram Sang <wsa@the-dreams.de>,
Libo Chen <clbchenlibo.chen@huawei.com>
Subject: Re: linux-next: manual merge of the usb.current tree with Linus' tree
Date: Sun, 19 May 2013 21:15:36 -0700 [thread overview]
Message-ID: <20130520041536.GA15865@kroah.com> (raw)
In-Reply-To: <20130520102159.18f2f976cb4000e48b45731e@canb.auug.org.au>
On Mon, May 20, 2013 at 10:21:59AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb.current tree got a conflict in
> drivers/usb/host/ohci-nxp.c between commit bb522812a1a6
> ("drivers/usb/host: don't check resource with devm_ioremap_resource")
> from Linus' tree and commit b3517d5de80e ("usb: ohci: fix goto wrong tag
> in err case") from the usb.current tree.
>
> The former remove a bit of code modified by the latter, so I did that and
> can carry the fix as necessary (no action is required).
Sounds fine to me, thanks.
greg k-h
prev parent reply other threads:[~2013-05-20 4:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-20 0:21 linux-next: manual merge of the usb.current tree with Linus' tree Stephen Rothwell
2013-05-20 4:15 ` Greg KH [this message]
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=20130520041536.GA15865@kroah.com \
--to=greg@kroah.com \
--cc=clbchenlibo.chen@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wsa@the-dreams.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