From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Viresh Kumar" <viresh.kumar@linaro.org>
Subject: Re: linux-next: manual merge of the vhost tree with the driver-core tree
Date: Wed, 1 Sep 2021 20:40:03 +0200 [thread overview]
Message-ID: <YS/JA6tFEHRCHiJ7@kroah.com> (raw)
In-Reply-To: <20210901141826.0c21c43e@canb.auug.org.au>
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
prev parent reply other threads:[~2021-09-01 18:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 4:18 linux-next: manual merge of the vhost tree with the driver-core tree Stephen Rothwell
2021-09-01 18:40 ` Greg Kroah-Hartman [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=YS/JA6tFEHRCHiJ7@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=sfr@canb.auug.org.au \
--cc=u.kleine-koenig@pengutronix.de \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).