From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>
Cc: "Michael S. Tsirkin" <mst@redhat•com>,
Christoph Hellwig <hch@lst•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Xie Yongji <xieyongji@bytedance•com>
Subject: Re: linux-next: manual merge of the vhost tree with the block tree
Date: Tue, 8 Mar 2022 16:36:40 +1100 [thread overview]
Message-ID: <20220308163640.42bbcdad@canb.auug.org.au> (raw)
In-Reply-To: <20220307153439.191104dd@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1617 bytes --]
Hi all,
On Mon, 7 Mar 2022 15:34:39 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-03-08 5:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-07 4:34 linux-next: manual merge of the vhost tree with the block tree Stephen Rothwell
2022-03-08 5:36 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220308163640.42bbcdad@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=xieyongji@bytedance$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox