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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20230515113207.3ae610ee@canb.auug.org.au>
Date:   Mon, 15 May 2023 11:32:07 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Martin Povišer <povik+lin@...ebit.org>
Subject: linux-next: manual merge of the sound-asoc tree with Linus' tree

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 <povik+lin@...ebit.org>
 +L:	asahi@...ts.linux.dev
 +L:	alsa-devel@...a-project.org (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 <marcan@...can.st>
  M:	Sven Peter <sven@...npeter.dev>

Content of type "application/pgp-signature" skipped