public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>,
	Liam Girdwood <lgirdwood@gmail•com>, Takashi Iwai <tiwai@suse•de>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Rander Wang <rander.wang@linux•intel.com>,
	Guennadi Liakhovetski <guennadi.liakhovetski@linux•intel.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux•intel.com>,
	Zhu Yingjiang <yingjiang.zhu@linux•intel.com>
Subject: linux-next: manual merge of the sound-asoc tree with the sound tree
Date: Fri, 9 Aug 2019 13:31:59 +1000	[thread overview]
Message-ID: <20190809133159.4d117905@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1785 bytes --]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in:

  sound/soc/sof/intel/hda-dsp.c

between commit:

  19abfefd4c76 ("ALSA: hda: Direct MMIO accesses")

from the sound tree and commits:

  fd15f2f5e272 ("ASoC: SOF: Intel: hda: Enable jack detection")
  d06973515f95 ("ASoC: SOF: Intel: hda: use SOF defined init chip in resume")

from the sound-asoc tree.

I fixed it up (I used the latter version and added the following merge
fix patch) 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.

From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 9 Aug 2019 13:28:00 +1000
Subject: [PATCH] ASoc: SOF: Intel: hda: merge fix up for "ALSA: hda: Direct MMIO accesses"

Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
 sound/soc/sof/intel/hda-ctrl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/sof/intel/hda-ctrl.c b/sound/soc/sof/intel/hda-ctrl.c
index a7fee403cb90..bc41028a7a01 100644
--- a/sound/soc/sof/intel/hda-ctrl.c
+++ b/sound/soc/sof/intel/hda-ctrl.c
@@ -254,7 +254,7 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset)
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
 	/* Reset stream-to-link mapping */
 	list_for_each_entry(hlink, &bus->hlink_list, list)
-		bus->io_ops->reg_writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV);
+		writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV);
 #endif
 
 	bus->chip_init = true;
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2019-08-09  3:32 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-09  3:31 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-14  3:01 linux-next: manual merge of the sound-asoc tree with the sound tree Stephen Rothwell
2025-07-14  9:18 ` Takashi Iwai
2023-10-20  1:26 Stephen Rothwell
2023-09-25  1:54 Stephen Rothwell
2019-11-12  1:26 Stephen Rothwell
2019-10-16  0:33 Stephen Rothwell
2019-10-07 23:52 Stephen Rothwell
2019-08-09  3:16 Stephen Rothwell
2019-08-01  2:50 Stephen Rothwell
2019-08-01 16:46 ` Pierre-Louis Bossart
2015-02-04  2:44 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=20190809133159.4d117905@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=broonie@kernel$(echo .)org \
    --cc=guennadi.liakhovetski@linux$(echo .)intel.com \
    --cc=lgirdwood@gmail$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=pierre-louis.bossart@linux$(echo .)intel.com \
    --cc=rander.wang@linux$(echo .)intel.com \
    --cc=tiwai@suse$(echo .)de \
    --cc=yingjiang.zhu@linux$(echo .)intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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