Subject: linux-next: manual merge of the sound-asoc tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 15 May 2023 11:32:07 +1000

Hi all,

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

  MAINTAINERS

between commit:

  80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")

from Linus' tree and commit:

  4ac690bbae02 ("ASoC: ssm3515: Add new amp driver")

from the sound-asoc 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 MAINTAINERS
index a8f74c3e72c9,c919c282f599..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1929,15 -1934,6 +1929,17 @@@ F:	arch/arm/mach-alpine
  F:	arch/arm64/boot/dts/amazon/
  F:	drivers/*/*alpine*
  
 +ARM/APPLE MACHINE SOUND DRIVERS
 +M:	Martin Povišer <[email-masked]>
 +L:	[email-masked]
 +L:	[email-masked] (moderated for non-subscribers)
 +S:	Maintained
++F:	Documentation/devicetree/bindings/sound/adi,ssm3515.yaml
 +F:	Documentation/devicetree/bindings/sound/apple,*
 +F:	sound/soc/apple/*
 +F:	sound/soc/codecs/cs42l83-i2c.c
++F:	sound/soc/codecs/ssm3515.c
 +
  ARM/APPLE MACHINE SUPPORT
  M:	Hector Martin <[email-masked]>
  M:	Sven Peter <[email-masked]>