Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1719729 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-08-25 05:00 +0200 |
| Last post | 2017-08-25 13:10 +0200 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
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
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-08-25 05:00 +0200 |
| Subject | linux-next: manual merge of the sound-asoc tree with the sound-current tree |
| Message-ID | <uid0J-6Iw-5@gated-at.bofh.it> |
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);
[toc] | [next] | [standalone]
| From | Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
|---|---|
| Date | 2017-08-25 11:40 +0200 |
| Message-ID | <uijfQ-2gM-21@gated-at.bofh.it> |
| In reply to | #1719729 |
On Fri, 2017-08-25 at 12:57 +1000, Stephen Rothwell wrote:
> 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")
This one AFAIU is a quick fix solely for v4.13.
Thus, the correct fix is to remove all 3 IDs from that table to get:
static const struct i2c_device_id rt5677_i2c_id[] = {
{ }
};
MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);
at the end.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
[toc] | [prev] | [next] | [standalone]
| From | Takashi Iwai <tiwai@suse.de> |
|---|---|
| Date | 2017-08-25 11:50 +0200 |
| Subject | Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree |
| Message-ID | <uijpx-2m3-25@gated-at.bofh.it> |
| In reply to | #1719863 |
On Fri, 25 Aug 2017 11:37:29 +0200,
Andy Shevchenko wrote:
>
> On Fri, 2017-08-25 at 12:57 +1000, Stephen Rothwell wrote:
> > 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")
>
> This one AFAIU is a quick fix solely for v4.13.
>
> Thus, the correct fix is to remove all 3 IDs from that table to get:
>
> static const struct i2c_device_id rt5677_i2c_id[] = {
>
> { }
> };
> MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);
>
> at the end.
Right. Mark, could you fix in your tree?
thanks,
Takashi
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-08-25 13:10 +0200 |
| Message-ID | <uikEW-3hj-19@gated-at.bofh.it> |
| In reply to | #1719863 |
Hi Andy,
On Fri, 25 Aug 2017 12:37:29 +0300 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
>
> This one AFAIU is a quick fix solely for v4.13.
>
> Thus, the correct fix is to remove all 3 IDs from that table to get:
>
> static const struct i2c_device_id rt5677_i2c_id[] = {
>
> { }
> };
> MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);
>
> at the end.
Thanks, I have fixed that up for Monday.
--
Cheers,
Stephen Rothwell
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web