Subject: Re: linux-next: manual merge of the vhost tree with the block tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 8 Mar 2022 16:36:40 +1100

Hi all,

On Mon, 7 Mar 2022 15:34:39 +1100 Stephen Rothwell <[email-masked]> wrote:
> 
> Today's linux-next merge of the vhost tree got a conflict in:
> 
>   drivers/block/virtio_blk.c
> 
> between commit:
> 
>   24b45e6c2517 ("virtio_blk: simplify refcounting")
> 
> from the block tree and commit:
> 
>   e030759a1ddc ("virtio-blk: Remove BUG_ON() in virtio_queue_rq()")
> 
> 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.
> 
> diff --cc drivers/block/virtio_blk.c
> index 5c636ca7f1a7,8c415be86732..000000000000
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@@ -69,9 -69,13 +69,6 @@@ struct virtio_blk 
>   	/* Process context for config space updates */
>   	struct work_struct config_work;
>   
> - 	/* What host tells us, plus 2 for header & tailer. */
> - 	unsigned int sg_elems;
>  -	/*
>  -	 * Tracks references from block_device_operations open/release and
>  -	 * virtio_driver probe/remove so this object can be freed once no
>  -	 * longer in use.
>  -	 */
>  -	refcount_t refs;
> --
>   	/* Ida index - used to track minor number allocations. */
>   	int index;
>   

This is now a conflict between the block tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell