Date:   Mon, 29 Nov 2021 16:29:36 +0200 (EET)
From:   Kai Vehmanen <kai.vehmanen@linux.intel.com>
To:     Mark Brown <broonie@kernel.org>
cc:     Takashi Iwai <tiwai@suse.de>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Kai Vehmanen <kai.vehmanen@linux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the
 sound-current tree
In-Reply-To: <YaTDKNOOP2I2dbI+@sirena.org.uk>
Message-ID: <alpine.DEB.2.22.394.2111291602310.3554566@eliteleevi.tm.intel.com>
References: <20211129113554.59416109@canb.auug.org.au> <s5ho8635n9g.wl-tiwai@suse.de> <YaTDKNOOP2I2dbI+@sirena.org.uk>
User-Agent: Alpine 2.22 (DEB 394 2020-01-19)
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7 02160 Espoo
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Precedence: bulk

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.

Br, Kai