Re: linux-next: manual merge of the tty tree with the tty.current tree

[Greg KH]

On Wed, Nov 26, 2014 at 06:12:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/of_serial.c between commit a5e9ab291c60 ("Revert
> "serial: of-serial: add PM suspend/resume support"") from the
> tty.current tree and commit 513e43858102 ("serial: of-serial: fix up PM
> ops on no_console_suspend and port type") from the tty tree.
> 
> I fixed it up (I assumed the tty tree version is correct and used that)
> and can carry the fix as necessary (no action is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc drivers/tty/serial/of_serial.c
> index f2fde9c21e9b,fd00e2521584..000000000000
> --- a/drivers/tty/serial/of_serial.c
> +++ b/drivers/tty/serial/of_serial.c
> @@@ -269,7 -342,9 +342,8 @@@ static struct of_device_id of_platform_
>   static struct platform_driver of_platform_serial_driver = {
>   	.driver = {
>   		.name = "of_serial",
>  -		.owner = THIS_MODULE,
>   		.of_match_table = of_platform_serial_table,
> + 		.pm = &of_serial_pm_ops,
>   	},
>   	.probe = of_platform_serial_probe,
>   	.remove = of_platform_serial_remove,


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/