From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jassi Brar <jaswinder.singh@linaro•org>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>,
Rob Herring <robherring2@gmail•com>
Cc: Hector Martin <marcan@marcan•st>, Joey Gouly <joey.gouly@arm•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mark Kettenis <kettenis@openbsd•org>,
Rob Herring <robh@kernel•org>, Sven Peter <sven@svenpeter•dev>
Subject: linux-next: manual merge of the mailbox tree with the arm-soc, devicetree trees
Date: Mon, 1 Nov 2021 13:51:35 +1100 [thread overview]
Message-ID: <20211101135135.395b6ad8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1922 bytes --]
Hi all,
Today's linux-next merge of the mailbox tree got a conflict in:
MAINTAINERS
between commits:
a3b539fedc09 ("dt-bindings: pci: Add DT bindings for apple,pcie")
e081c53a5ba1 ("MAINTAINERS: add pinctrl-apple-gpio to ARM/APPLE MACHINE")
from the arm-soc, devicetree trees and commit:
7feea290e9f4 ("MAINTAINERS: Add Apple mailbox files")
from the mailbox 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 244002eb7220,333eff21b8d2..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1730,17 -1728,15 +1736,20 @@@ B: https://github.com/AsahiLinux/linux/
C: irc://irc.oftc.net/asahi-dev
T: git https://github.com/AsahiLinux/linux.git
F: Documentation/devicetree/bindings/arm/apple.yaml
+F: Documentation/devicetree/bindings/i2c/apple,i2c.yaml
F: Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
+ F: Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
+F: Documentation/devicetree/bindings/pci/apple,pcie.yaml
F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
F: arch/arm64/boot/dts/apple/
+F: drivers/i2c/busses/i2c-pasemi-core.c
+F: drivers/i2c/busses/i2c-pasemi-platform.c
F: drivers/irqchip/irq-apple-aic.c
+ F: drivers/mailbox/apple-mailbox.c
+F: drivers/pinctrl/pinctrl-apple-gpio.c
F: include/dt-bindings/interrupt-controller/apple-aic.h
F: include/dt-bindings/pinctrl/apple.h
+ F: include/linux/apple-mailbox.h
ARM/ARTPEC MACHINE SUPPORT
M: Jesper Nilsson <jesper.nilsson@axis•com>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2021-11-01 2:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20211101135135.395b6ad8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=jaswinder.singh@linaro$(echo .)org \
--cc=joey.gouly@arm$(echo .)com \
--cc=kettenis@openbsd$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marcan@marcan$(echo .)st \
--cc=olof@lixom$(echo .)net \
--cc=robh@kernel$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
--cc=sven@svenpeter$(echo .)dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox