From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Turquette <mturquette@baylibre•com>,
Stephen Boyd <sboyd@codeaurora•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Eugeniy Paltsev <Eugeniy.Paltsev@synopsys•com>,
Randy Dunlap <rdunlap@infradead•org>,
Linus Torvalds <torvalds@linux-foundation•org>
Subject: linux-next: manual merge of the clk tree with Linus' tree
Date: Mon, 24 Jul 2017 10:37:34 +1000 [thread overview]
Message-ID: <20170724103734.6316c868@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
MAINTAINERS
between commit:
82abbea734d6 ("MAINTAINERS: fix alphabetical ordering")
from Linus' tree and commit:
6d7489c74a6e ("clk: axs10x: introduce AXS10X pll driver")
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.
BTW, Linus, I am using your perl script to check my resolution results
(thanks), but could you please make it executable?
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index fdbe3da4d5de,c571fcf62740..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12599,6 -12738,6 +12599,12 @@@ F: drivers/clocksource/arc_timer.
F: drivers/tty/serial/arc_uart.c
T: git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
++SYNOPSYS ARC SDP clock driver
++M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys•com>
++S: Supported
++F: drivers/clk/axs10x/*
++F: Documentation/devicetree/bindings/clock/snps,pll-clock.txt
++
SYNOPSYS ARC SDP platform support
M: Alexey Brodkin <abrodkin@synopsys•com>
S: Supported
next reply other threads:[~2017-07-24 0:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-24 0:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-29 22:07 linux-next: manual merge of the clk tree with Linus' tree Stephen Rothwell
2019-06-06 23:13 Stephen Rothwell
2015-02-20 0:17 Stephen Rothwell
2014-01-29 3:25 Stephen Rothwell
2014-01-29 8:53 ` Nicolas Ferre
2013-08-27 9:03 Stephen Rothwell
2013-08-27 10:09 ` James Hogan
2013-08-27 15:44 ` Sören Brinkmann
2013-08-27 16:53 ` Mike Turquette
2013-08-28 0:04 ` Stephen Rothwell
2013-08-28 7:22 ` Stephen Rothwell
2013-08-28 8:05 ` James Hogan
2013-08-28 15:48 ` Sören Brinkmann
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=20170724103734.6316c868@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Eugeniy.Paltsev@synopsys$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@baylibre$(echo .)com \
--cc=rdunlap@infradead$(echo .)org \
--cc=sboyd@codeaurora$(echo .)org \
--cc=torvalds@linux-foundation$(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