mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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
Date: Mon, 29 Nov 2021 16:29:36 +0200 (EET)	[thread overview]
Message-ID: <alpine.DEB.2.22.394.2111291602310.3554566@eliteleevi.tm.intel.com> (raw)
In-Reply-To: <YaTDKNOOP2I2dbI+@sirena.org.uk>

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

  reply	other threads:[~2021-11-29 14:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-29  0:35 Stephen Rothwell
2021-11-29  9:23 ` Takashi Iwai
2021-11-29 12:10   ` Mark Brown
2021-11-29 14:29     ` Kai Vehmanen [this message]
2021-11-29 14:43       ` Takashi Iwai
2021-11-29 17:16         ` Kai Vehmanen
  -- strict thread matches above, loose matches on Subject: below --
2017-08-25  2:57 Stephen Rothwell
2017-08-25  9:37 ` Andy Shevchenko
2017-08-25  9:40   ` Takashi Iwai
2017-08-25 11:02   ` Stephen Rothwell

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=alpine.DEB.2.22.394.2111291602310.3554566@eliteleevi.tm.intel.com \
    --to=kai.vehmanen@linux.intel.com \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ranjani.sridharan@linux.intel.com \
    --cc=sfr@canb.auug.org.au \
    --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

all inboxes | Powered by JetHome®