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

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

[Stephen Rothwell]

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);

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

[Andy Shevchenko]

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

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

[Takashi Iwai]

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

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

[Stephen Rothwell]

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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 783 bytes --]

Hi all,

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

  sound/soc/sof/intel/hda.c

between commit:

  86f74ba3fef5 ("ASoC: SOF: hda: reset DAI widget before reconfiguring it")

from the sound-current tree and commit:

  a0f84dfb3f6d ("ASoC: SOF: IPC: dai: Expand DAI_CONFIG IPC flags")

from the sound-asoc tree.

I fixed it up (I just used the latter version) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Takashi Iwai]

On Mon, 29 Nov 2021 01:35:54 +0100,
Stephen Rothwell wrote:
> 
> Hi all,
> 
> Today's linux-next merge of the sound-asoc tree got a conflict in:
> 
>   sound/soc/sof/intel/hda.c
> 
> between commit:
> 
>   86f74ba3fef5 ("ASoC: SOF: hda: reset DAI widget before reconfiguring it")
> 
> from the sound-current tree and commit:
> 
>   a0f84dfb3f6d ("ASoC: SOF: IPC: dai: Expand DAI_CONFIG IPC flags")
> 
> from the sound-asoc tree.
> 
> I fixed it up (I just used the latter version) 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.

Both are from ASoC tree, while the former landed in my sound git tree
for-linus branch recently.

Mark, could you resolve in the latter branch?


thanks,

Takashi

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

On Mon, Nov 29, 2021 at 10:23:07AM +0100, Takashi Iwai wrote:

> Mark, could you resolve in the latter branch?

I'll just leave them for now, Linus got angry about merging up fixes
just to resolve conflicts so if it's not an actual dependency...

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Kai Vehmanen]

Hi,

On Mon, 29 Nov 2021, Mark Brown wrote:

> On Mon, Nov 29, 2021 at 10:23:07AM +0100, Takashi Iwai wrote:
> 
> > Mark, could you resolve in the latter branch?
> 
> I'll just leave them for now, Linus got angry about merging up fixes
> just to resolve conflicts so if it's not an actual dependency...

the asoc for-5.17 branch does have all the needed changes and the 
linux-next merged version seems ok. We've already sent many further 
changes that touch this area of code to asoc for-5.17. Let me know if some 
actions are needed to help.

Br, Kai

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

[Takashi Iwai]

On Mon, 29 Nov 2021 15:29:36 +0100,
Kai Vehmanen wrote:
> 
> Hi,
> 
> On Mon, 29 Nov 2021, Mark Brown wrote:
> 
> > On Mon, Nov 29, 2021 at 10:23:07AM +0100, Takashi Iwai wrote:
> > 
> > > Mark, could you resolve in the latter branch?
> > 
> > I'll just leave them for now, Linus got angry about merging up fixes
> > just to resolve conflicts so if it's not an actual dependency...
> 
> the asoc for-5.17 branch does have all the needed changes and the 
> linux-next merged version seems ok. We've already sent many further 
> changes that touch this area of code to asoc for-5.17. Let me know if some 
> actions are needed to help.

The question is rather whether this discrepancy would cause a problem
for further developments.  If back-merging 5.16 stuff makes things
easier, it should be done so.  OTOH, if it's just for resolving the
conflict in the final tree, we can leave it.


thanks,

Takashi

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

[Kai Vehmanen]

Hi,

On Mon, 29 Nov 2021, Takashi Iwai wrote:

> On Mon, 29 Nov 2021 15:29:36 +0100, Kai Vehmanen wrote:
> > the asoc for-5.17 branch does have all the needed changes and the 
> > linux-next merged version seems ok. We've already sent many further 
> > changes that touch this area of code to asoc for-5.17. Let me know if some 
> 
> The question is rather whether this discrepancy would cause a problem
> for further developments.  If back-merging 5.16 stuff makes things
> easier, it should be done so.  OTOH, if it's just for resolving the
> conflict in the final tree, we can leave it.

I believe it's the latter case, it would be just for resolving conflict
in the final tree. The patches we have queued up for 5.17 but not yet 
sent, all apply cleanly on top of asoc for-5.17, so back-merge is not 
needed for this.

Br, Kai