From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Turquette <mturquette@baylibre•com>,
Stephen Boyd <sboyd@codeaurora•org>,
Philipp Zabel <p.zabel@pengutronix•de>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Andrew F. Davis" <afd@ti•com>, Tero Kristo <t-kristo@ti•com>
Subject: linux-next: manual merge of the clk tree with the reset tree
Date: Fri, 16 Jun 2017 09:15:32 +1000 [thread overview]
Message-ID: <20170616091532.6cf9127a@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
MAINTAINERS
between commits:
18a006203b88 ("dt-bindings: reset: Add TI SCI reset binding")
28df169b9afa ("reset: Add the TI SCI reset driver")
from the reset tree and commits:
8f306cfe4383 ("Documentation: dt: Add TI SCI clock driver")
b745c0794e2f ("clk: keystone: Add sci-clk driver support")
from the clk 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 003e0e302d46,1ba72e6d8254..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12638,8 -12630,8 +12638,10 @@@ F: include/linux/soc/ti/ti_sci_protocol
F: Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
F: include/dt-bindings/genpd/k2g.h
F: drivers/soc/ti/ti_sci_pm_domains.c
+F: Documentation/devicetree/bindings/reset/ti,sci-reset.txt
+F: drivers/reset/reset-ti-sci.c
+ F: Documentation/devicetree/bindings/clock/ti,sci-clk.txt
+ F: drivers/clk/keystone/sci-clk.c
THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
M: Hans Verkuil <hverkuil@xs4all•nl>
reply other threads:[~2017-06-15 23:15 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=20170616091532.6cf9127a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=afd@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@baylibre$(echo .)com \
--cc=p.zabel@pengutronix$(echo .)de \
--cc=sboyd@codeaurora$(echo .)org \
--cc=t-kristo@ti$(echo .)com \
/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