* linux-next: manual merge of the moduleh tree with the usb tree
@ 2012-03-06 5:50 Stephen Rothwell
2012-03-06 14:56 ` Paul Gortmaker
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-03-06 5:50 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Felipe Balbi, Greg KH
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/usb/dwc3/dwc3-omap.c between commit 45b3cd4ad79b ("usb: dwc3:
omap: convert pdata to of property") from the usb tree and commit
13ae246db4a0 ("includecheck: delete any duplicate instances of module.h")
from the moduleh tree.
Just context changes. I fixed it up and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the moduleh tree with the usb tree
2012-03-06 5:50 linux-next: manual merge of the moduleh tree with the usb tree Stephen Rothwell
@ 2012-03-06 14:56 ` Paul Gortmaker
0 siblings, 0 replies; 3+ messages in thread
From: Paul Gortmaker @ 2012-03-06 14:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Felipe Balbi, Greg KH
On 12-03-06 12:50 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/usb/dwc3/dwc3-omap.c between commit 45b3cd4ad79b ("usb: dwc3:
> omap: convert pdata to of property") from the usb tree and commit
> 13ae246db4a0 ("includecheck: delete any duplicate instances of module.h")
> from the moduleh tree.
>
> Just context changes. I fixed it up and can carry the fix as necessary.
Thanks Stephen,
I had a look and the instance being deleted is really the right
one to delete, so this conflict will have to stay carried it seems.
Paul.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the moduleh tree with the usb tree
@ 2012-03-06 14:56 ` Paul Gortmaker
0 siblings, 0 replies; 3+ messages in thread
From: Paul Gortmaker @ 2012-03-06 14:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Felipe Balbi, Greg KH
On 12-03-06 12:50 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/usb/dwc3/dwc3-omap.c between commit 45b3cd4ad79b ("usb: dwc3:
> omap: convert pdata to of property") from the usb tree and commit
> 13ae246db4a0 ("includecheck: delete any duplicate instances of module.h")
> from the moduleh tree.
>
> Just context changes. I fixed it up and can carry the fix as necessary.
Thanks Stephen,
I had a look and the instance being deleted is really the right
one to delete, so this conflict will have to stay carried it seems.
Paul.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-06 14:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-06 5:50 linux-next: manual merge of the moduleh tree with the usb tree Stephen Rothwell
2012-03-06 14:56 ` Paul Gortmaker
2012-03-06 14:56 ` Paul Gortmaker
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.