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

[Greg Kroah-Hartman]

On Wed, Sep 01, 2021 at 02:18:26PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the vhost tree got a conflict in:
> 
>   drivers/virtio/virtio.c
> 
> between commit:
> 
>   fc7a6209d571 ("bus: Make remove callback return void")
> 
> from the driver-core tree and commit:
> 
>   fd704f203ca1 ("virtio: Bind virtio device to device-tree node")
> 
> from the vhost tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/virtio/virtio.c
> index 1ea0c1f6a1fd,c46cc1fbc7ae..000000000000
> --- a/drivers/virtio/virtio.c
> +++ b/drivers/virtio/virtio.c
> @@@ -292,6 -293,10 +293,8 @@@ static void virtio_dev_remove(struct de
>   
>   	/* Acknowledge the device's existence again. */
>   	virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);
> + 
> + 	of_node_put(dev->dev.of_node);
>  -
>  -	return 0;
>   }
>   
>   static struct bus_type virtio_bus = {

Fix looks correct to me, thanks!

greg k-h