From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>, Takashi Iwai <tiwai@suse.de>
Cc: Anton Yakovlev <anton.yakovlev@opensynergy.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the vhost tree with the sound tree
Date: Tue, 9 Mar 2021 12:58:33 +1100 [thread overview]
Message-ID: <20210309125833.0355a754@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1942 bytes --]
Hi all,
Today's linux-next merge of the vhost tree got conflicts in:
sound/virtio/virtio_card.c
sound/virtio/virtio_card.h
sound/virtio/virtio_ctl_msg.c
sound/virtio/virtio_pcm.c
sound/virtio/virtio_pcm.h
sound/virtio/virtio_pcm_msg.c
sound/virtio/virtio_pcm_ops.c
between commits:
de3a9980d8c3 ("ALSA: virtio: add virtio sound driver")
9d45e514da88 ("ALSA: virtio: handling control messages")
29b96bf50ba9 ("ALSA: virtio: build PCM devices and substream hardware descriptors")
f40a28679e0b ("ALSA: virtio: handling control and I/O messages for the PCM device")
da76e9f3e43a ("ALSA: virtio: PCM substream operators")
ca61a41f389c ("ALSA: virtio: introduce jack support")
19325fedf245 ("ALSA: virtio: introduce PCM channel map support")
575483e90a32 ("ALSA: virtio: introduce device suspend/resume support")
from the sound tree and commits:
1e2fb08629e5 ("ALSA: virtio: add virtio sound driver")
3fb7ce161568 ("ALSA: virtio: handling control messages")
83ec5db56076 ("ALSA: virtio: build PCM devices and substream hardware descriptors")
68742d8557b8 ("ALSA: virtio: handling control and I/O messages for the PCM device")
def2208d373b ("ALSA: virtio: PCM substream operators")
613515055d34 ("ALSA: virtio: introduce jack support")
96db428c31f1 ("ALSA: virtio: introduce PCM channel map support")
1f77f124f2f2 ("ALSA: virtio: introduce device suspend/resume support")
from the vhost tree.
I fixed it up (the sound tree commits have newer author dates, so I just
used them) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-03-09 1:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-09 1:58 Stephen Rothwell [this message]
2021-03-09 6:46 ` linux-next: manual merge of the vhost tree with the sound tree Takashi Iwai
2021-03-09 11:01 ` Michael S. Tsirkin
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=20210309125833.0355a754@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=anton.yakovlev@opensynergy.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=tiwai@suse.de \
/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).