From: Vinod Koul <vkoul@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Vinod Koul <vkoul@kernel•org>, Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>
Cc: Bard Liao <yung-chuan.liao@linux•intel.com>,
Charles Keepax <ckeepax@opensource•cirrus.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Pierre-Louis Bossart <pierre-louis.bossart@linux•dev>,
Pierre-Louis Bossart <pierre-louis.bossart@linux•intel.com>
Subject: Re: linux-next: manual merge of the soundwire tree with the sound-asoc tree
Date: Tue, 19 Nov 2024 11:55:44 +0530 [thread overview]
Message-ID: <0f117213-7001-4bc1-a9af-335d10be3489@kernel.org> (raw)
In-Reply-To: <20241115150118.3abfa3c6@canb.auug.org.au>
On 15/11/24 09:31, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the soundwire tree got a conflict in:
>
> include/linux/soundwire/sdw.h
>
> between commit:
>
> 3a513da1ae33 ("ASoC: SDCA: add initial module")
>
> from the sound-asoc tree and commit:
>
> e311b04db66a ("soundwire: Update the includes on the sdw.h header")
>
> from the soundwire tree.
>
> I fixed it up (see below) 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.
Thanks, this looks right to me and will let Linus know when I send the
pull request
--
~Vinod
next prev parent reply other threads:[~2024-11-19 6:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-15 4:01 linux-next: manual merge of the soundwire tree with the sound-asoc tree Stephen Rothwell
2024-11-19 6:25 ` Vinod Koul [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 4:03 Stephen Rothwell
2022-07-07 5:28 Stephen Rothwell
2022-07-18 8:29 ` 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=0f117213-7001-4bc1-a9af-335d10be3489@kernel.org \
--to=vkoul@kernel$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=ckeepax@opensource$(echo .)cirrus.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 .)dev \
--cc=pierre-louis.bossart@linux$(echo .)intel.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=yung-chuan.liao@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