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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23674C433F5 for ; Mon, 29 Nov 2021 14:45:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232206AbhK2Osf (ORCPT ); Mon, 29 Nov 2021 09:48:35 -0500 Received: from smtp-out2.suse.de ([195.135.220.29]:46634 "EHLO smtp-out2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345800AbhK2Oq1 (ORCPT ); Mon, 29 Nov 2021 09:46:27 -0500 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 842791FD3A; Mon, 29 Nov 2021 14:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1638196988; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=NWUEKk1LbiEJfj4CY9t4KjyiCWPpGKwfVKuULja5Bsg=; b=b3DyrDJUHh+1aT/FKhCgJcWEVXHC3ww0ObFICqkVT/jzrvEtBU5Dgpd8rXU6uQfrXtSkY+ zTsSCqd8MhEfHLQoWOv8TgWq593fUmrgYwF1l5T9sgGTe75vW2bWCSMxqb5qDQML6IYCfq eGVgpHLskhh2DQIE8nLpuEzmPiEdAFo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1638196988; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=NWUEKk1LbiEJfj4CY9t4KjyiCWPpGKwfVKuULja5Bsg=; b=v96RDHOKkFNh5drXWl3FjCyiiug6mA0W4s2DJ1DYNaL4UKCNX+vk2hcsGjPhuzxs1UnxIn oz9bNW6us15MCGBA== Received: from alsa1.suse.de (alsa1.suse.de [10.160.4.42]) by relay2.suse.de (Postfix) with ESMTP id 3C279A3B81; Mon, 29 Nov 2021 14:43:08 +0000 (UTC) Date: Mon, 29 Nov 2021 15:43:08 +0100 Message-ID: From: Takashi Iwai To: Kai Vehmanen Cc: Mark Brown , Takashi Iwai , Stephen Rothwell , Liam Girdwood , Linux Kernel Mailing List , Linux Next Mailing List , Ranjani Sridharan Subject: Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree In-Reply-To: References: <20211129113554.59416109@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 Mon, 29 Nov 2021 15:29:36 +0100, Kai Vehmanen wrote: > > Hi, > > On Mon, 29 Nov 2021, Mark Brown wrote: > > > On Mon, Nov 29, 2021 at 10:23:07AM +0100, Takashi Iwai wrote: > > > > > Mark, could you resolve in the latter branch? > > > > I'll just leave them for now, Linus got angry about merging up fixes > > just to resolve conflicts so if it's not an actual dependency... > > the asoc for-5.17 branch does have all the needed changes and the > linux-next merged version seems ok. We've already sent many further > changes that touch this area of code to asoc for-5.17. Let me know if some > actions are needed to help. The question is rather whether this discrepancy would cause a problem for further developments. If back-merging 5.16 stuff makes things easier, it should be done so. OTOH, if it's just for resolving the conflict in the final tree, we can leave it. thanks, Takashi