[lkml]   [2012]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the moduleh tree with the usb tree
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.


 \ /
  Last update: 2012-03-06 15:59    [W:0.032 / U:2.720 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site