From: Stephen Rothwell <sfr@canb•auug.org.au>
To: 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: linux-next: manual merge of the soundwire tree with the sound-asoc tree
Date: Fri, 15 Nov 2024 15:01:18 +1100 [thread overview]
Message-ID: <20241115150118.3abfa3c6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1478 bytes --]
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.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/soundwire/sdw.h
index 49d690f3d29a,784656f740f6..000000000000
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@@ -4,14 -4,20 +4,21 @@@
#ifndef __SOUNDWIRE_H
#define __SOUNDWIRE_H
+ #include <linux/bitfield.h>
#include <linux/bug.h>
- #include <linux/lockdep_types.h>
+ #include <linux/completion.h>
+ #include <linux/device.h>
#include <linux/irq.h>
#include <linux/irqdomain.h>
+ #include <linux/lockdep_types.h>
#include <linux/mod_devicetable.h>
- #include <linux/bitfield.h>
+ #include <linux/mutex.h>
+ #include <linux/types.h>
+#include <sound/sdca.h>
+ struct dentry;
+ struct fwnode_handle;
+
struct sdw_bus;
struct sdw_slave;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-11-15 4:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-15 4:01 Stephen Rothwell [this message]
2024-11-19 6:25 ` linux-next: manual merge of the soundwire tree with the sound-asoc tree Vinod Koul
-- 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=20241115150118.3abfa3c6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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=vkoul@kernel$(echo .)org \
--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