linux-kernel - linux-next: manual merge of the iio tree with the arm-soc 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230117122552.64f70650@canb.auug.org.au>
Date:   Tue, 17 Jan 2023 12:25:52 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Cameron <Jonathan.Cameron@...wei.com>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc:     ARM <linux-arm-kernel@...ts.infradead.org>,
        Alexander Sverdlin <alexander.sverdlin@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Lukas Bulwahn <lukas.bulwahn@...il.com>
Subject: linux-next: manual merge of the iio tree with the arm-soc tree

Hi all,

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

  MAINTAINERS

between commit:

  59ce53421673 ("MAINTAINERS: update file entries after arm multi-platform rework and mach-pxa removal")

from the arm-soc tree and commit:

  08025a3bd9e0 ("dt-bindings: iio: adc: ep93xx: Add cirrus,ep9301-adc description")

from the iio 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 390d79c20a59,9ff472ca1244..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2071,8 -2091,10 +2071,10 @@@ M:	Hartley Sweeten <hsweeten@...ionengr
  M:	Alexander Sverdlin <alexander.sverdlin@...il.com>
  L:	linux-arm-kernel@...ts.infradead.org (moderated for non-subscribers)
  S:	Maintained
+ F:	Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml
 +F:	arch/arm/boot/compressed/misc-ep93xx.h
  F:	arch/arm/mach-ep93xx/
 -F:	arch/arm/mach-ep93xx/include/mach/
+ F:	drivers/iio/adc/ep93xx_adc.c
  
  ARM/CLKDEV SUPPORT
  M:	Russell King <linux@...linux.org.uk>

Content of type "application/pgp-signature" skipped