Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1719729

linux-next: manual merge of the sound-asoc tree with the sound-current tree

Show all headers | View raw

Hi all,

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

  sound/soc/codecs/rt5677.c

between commit:

  9ce76511b67b ("ASoC: rt5677: Reintroduce I2C device IDs")

from the sound-current tree and commit:

  ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module sources")

from the sound-asoc tree.

I considered just using the latter version, but in the end did not.

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 sound/soc/codecs/rt5677.c
index 6f629278d982,c735590c5a25..000000000000
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@@ -5019,9 -5010,6 +5010,7 @@@ static const struct regmap_config rt567
  };
  
  static const struct i2c_device_id rt5677_i2c_id[] = {
- 	{ "rt5677", RT5677 },
- 	{ "rt5676", RT5676 },
 +	{ "RT5677CE:00", RT5677 },
  	{ }
  };
  MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the sound-asoc tree with the  sound-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-25 05:00 +0200
  Re: linux-next: manual merge of the sound-asoc tree with the  sound-current tree Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-08-25 11:40 +0200
    Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree Takashi Iwai <tiwai@suse.de> - 2017-08-25 11:50 +0200
    Re: linux-next: manual merge of the sound-asoc tree with the  sound-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-25 13:10 +0200

csiph-web