From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
Alexander Sverdlin <alexander.sverdlin@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: linux-next: manual merge of the iio tree with the arm-soc tree
Date: Tue, 17 Jan 2023 12:25:52 +1100 [thread overview]
Message-ID: <20230117122552.64f70650@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]
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@visionengr
M: Alexander Sverdlin <alexander.sverdlin@gmail.com>
L: linux-arm-kernel@lists.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@armlinux.org.uk>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
Alexander Sverdlin <alexander.sverdlin@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: linux-next: manual merge of the iio tree with the arm-soc tree
Date: Tue, 17 Jan 2023 12:25:52 +1100 [thread overview]
Message-ID: <20230117122552.64f70650@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1395 bytes --]
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@visionengr
M: Alexander Sverdlin <alexander.sverdlin@gmail.com>
L: linux-arm-kernel@lists.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@armlinux.org.uk>
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2023-01-17 1:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-17 1:25 Stephen Rothwell [this message]
2023-01-17 1:25 ` linux-next: manual merge of the iio tree with the arm-soc tree Stephen Rothwell
2023-02-06 2:33 ` Stephen Rothwell
2023-02-06 2:33 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230117122552.64f70650@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Jonathan.Cameron@Huawei.com \
--cc=alexander.sverdlin@gmail.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lukas.bulwahn@gmail.com \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.