linux-kernel - linux-next: manual merge of the sound-asoc tree with the hwmon-staging 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: <20190401095506.39bf18eb@canb.auug.org.au>
Date:   Mon, 1 Apr 2019 09:55:06 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>,
        Guenter Roeck <linux@...ck-us.net>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Lucas Tanure <tanureal@...nsource.cirrus.com>,
        Piotr Stankiewicz <piotrs@...nsource.cirrus.com>,
        Charles Keepax <ckeepax@...nsource.cirrus.com>
Subject: linux-next: manual merge of the sound-asoc tree with the
 hwmon-staging tree

Hi all,

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

  MAINTAINERS

between commit:

  d1ce5addbaa0 ("hwmon: lochnagar: Add Lochnagar 2 hardware monitoring driver")

from the hwmon-staging tree and commit:

  16123412a628 ("ASoC: lochnagar: Add driver to support Lochnagar 2 sound card")

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 e254d42e0f2c,84b9d7557ca3..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3815,10 -3805,9 +3816,11 @@@ F:	include/dt-bindings/pinctrl/lochnaga
  F:	include/linux/mfd/lochnagar*
  F:	Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt
  F:	Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt
 +F:	Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt
  F:	Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
  F:	Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
+ F:	Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
 +F:	Documentation/hwmon/lochnagar
  
  CISCO FCOE HBA DRIVER
  M:	Satish Kharat <satishkh@...co.com>

Content of type "application/pgp-signature" skipped