* linux-next: manual merge of the usb.current tree with Linus' tree
@ 2013-05-20 0:21 Stephen Rothwell
2013-05-20 4:15 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-05-20 0:21 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Wolfram Sang, Libo Chen
[-- Attachment #1: Type: text/plain, Size: 532 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the usb.current tree with Linus' tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2013-05-20 4:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Wolfram Sang, Libo Chen
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-20 4:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox