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

2021-03-09 Thread Michael S. Tsirkin
On Tue, Mar 09, 2021 at 07:46:12AM +0100, Takashi Iwai wrote: > On Tue, 09 Mar 2021 02:58:33 +0100, > Stephen Rothwell wrote: > > > > 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/vir

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

2021-03-08 Thread Takashi Iwai
On Tue, 09 Mar 2021 02:58:33 +0100, Stephen Rothwell wrote: > > 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 >

linux-next: manual merge of the vhost tree with the sound tree

2021-03-08 Thread Stephen Rothwell
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: