From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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>,
Cezary Rojewski <cezary.rojewski@intel.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the sound tree
Date: Thu, 1 Aug 2019 11:46:54 -0500 [thread overview]
Message-ID: <3dfa9102-6fe4-dc9e-12d5-8fac565059da@linux.intel.com> (raw)
In-Reply-To: <20190801125008.4a533637@canb.auug.org.au>
On 7/31/19 9:50 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the sound-asoc tree got conflicts in:
>
> sound/soc/intel/skylake/skl-nhlt.c
> sound/soc/intel/skylake/skl.h
>
> between commit:
>
> 1169cbf6b98e ("ASoC: Intel: Skylake: use common NHLT module")
>
> from the sound tree and commit:
>
> bcc2a2dc3ba8 ("ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct")
>
> from the sound-asoc tree.
>
> I fixed it up (I think, see below (I used the sound tree version of
> ound/soc/intel/skylake/skl-nhlt.c)) 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.
Mark, this comes my NHLT fixes merged by Takashi and available on his
topic/hda-dmic branch.
This can be fixed by merging this topic/hda-dmic into your for-next
branch, with a minor set of merge conflicts already identified by Stephen.
If you don't like merge conflicts, we can also do this with
revert-merge-reapply, I pushed a branch
https://github.com/plbossart/sound/commits/fix/nhlt-conflicts to provide
the sequence needed
Sorry about that, let me know if I can help further.
-Pierre
next prev parent reply other threads:[~2019-08-01 16:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-01 2:50 linux-next: manual merge of the sound-asoc tree with the sound tree Stephen Rothwell
2019-08-01 16:46 ` Pierre-Louis Bossart [this message]
-- strict thread matches above, loose matches on Subject: below --
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:31 Stephen Rothwell
2019-08-09 3:16 Stephen Rothwell
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=3dfa9102-6fe4-dc9e-12d5-8fac565059da@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).