From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Herring <robherring2@gmail•com>, Andy Gross <agross@codeaurora•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@linaro•org>
Subject: linux-next: manual merge of the dt-rh tree with the qcom tree
Date: Mon, 1 Feb 2016 13:10:17 +1100 [thread overview]
Message-ID: <20160201131017.5a843363@canb.auug.org.au> (raw)
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in:
MAINTAINERS
between commit:
43ed2986476d ("MAINTAINERS: add qcom i2c and spi drivers to list")
from the qcom tree and commit:
e68d7c143a62 ("MAINTAINERS: Add missing platform maintainers for dts files")
from the dt-rh tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index 5318f7972fb9,973336739ae5..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1431,9 -1434,8 +1440,10 @@@ S: Maintaine
F: arch/arm/boot/dts/qcom-*.dts
F: arch/arm/boot/dts/qcom-*.dtsi
F: arch/arm/mach-qcom/
+ F: arch/arm64/boot/dts/qcom/*
+F: drivers/i2c/busses/i2c-qup.c
F: drivers/soc/qcom/
+F: drivers/spi/spi-qup.c
F: drivers/tty/serial/msm_serial.h
F: drivers/tty/serial/msm_serial.c
F: drivers/*/pm8???-*
reply other threads:[~2016-02-01 2:10 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=20160201131017.5a843363@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agross@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robherring2@gmail$(echo .)com \
--cc=srinivas.kandagatla@linaro$(echo .)org \
/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