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:
pgpracv65Ep71.pgp
Description: OpenPGP digital signature
