From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EBF1C433E0 for ; Tue, 9 Mar 2021 06:47:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 613456527B for ; Tue, 9 Mar 2021 06:47:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229480AbhCIGqf (ORCPT ); Tue, 9 Mar 2021 01:46:35 -0500 Received: from mx2.suse.de ([195.135.220.15]:59344 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229691AbhCIGqO (ORCPT ); Tue, 9 Mar 2021 01:46:14 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id B6668AB8C; Tue, 9 Mar 2021 06:46:12 +0000 (UTC) Date: Tue, 09 Mar 2021 07:46:12 +0100 Message-ID: From: Takashi Iwai To: Stephen Rothwell Cc: "Michael S. Tsirkin" , Anton Yakovlev , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the vhost tree with the sound tree In-Reply-To: <20210309125833.0355a754@canb.auug.org.au> References: <20210309125833.0355a754@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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 > 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. Michael, could you drop those? These must be the old versions that contained lots of bugs. As already announced, you can pull from my immutable branch, tagged virtio_snd-5.12-rc2, too. Sorry for the mess! Takashi