Re: linux-next: manual merge of the usb tree with the driver-core tree

[Greg KH]

On Fri, Nov 28, 2014 at 05:32:46PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/chipidea/core.c between commit 5bc879a6a271 ("usb:
> chipidea: drop owner assignment from platform_drivers") from the
> driver-core tree and commit 8076932ff2fc ("usb: chipidea: add system
> power management support") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc drivers/usb/chipidea/core.c
> index 947ed6e78be2,e14eafb2a05e..000000000000
> --- a/drivers/usb/chipidea/core.c
> +++ b/drivers/usb/chipidea/core.c
> @@@ -751,6 -867,8 +867,7 @@@ static struct platform_driver ci_hdrc_d
>   	.remove	= ci_hdrc_remove,
>   	.driver	= {
>   		.name	= "ci_hdrc",
> + 		.pm	= &ci_pm_ops,
>  -		.owner	= THIS_MODULE,
>   	},
>   };
>   

Looks good, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/