From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: "Linux-Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Manivannan Sadhasivam" <manivannan.sadhasivam@linaro.org>,
"Andreas Färber" <afaerber@suse.de>,
"Daniel Lezcano" <daniel.lezcano@linaro.org>
Subject: linux-next: manual merge of the tip tree with the arm-soc tree
Date: Mon, 8 Oct 2018 13:32:40 +1100 [thread overview]
Message-ID: <20181008133158.773196b8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1306 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
MAINTAINERS
between commits:
81aa283c6924 ("MAINTAINERS: Add Actions Semi S900 clk entries")
677309b0e9e6 ("MAINTAINERS: Add entry for Actions Semi Owl SoCs DMA driver")
from the arm-soc tree and commit:
9d8d47ea6ec6 ("clocksource/drivers: Unify the names to timer-* format")
from the tip 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 c4d323faa764,2a83f2339651..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1218,10 -1180,7 +1218,10 @@@ N: ow
F: arch/arm/mach-actions/
F: arch/arm/boot/dts/owl-*
F: arch/arm64/boot/dts/actions/
+F: drivers/clk/actions/
- F: drivers/clocksource/owl-*
+ F: drivers/clocksource/timer-owl*
+F: drivers/dma/owl-dma.c
+F: drivers/i2c/busses/i2c-owl.c
F: drivers/pinctrl/actions/*
F: drivers/soc/actions/
F: include/dt-bindings/power/owl-*
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-10-08 2:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-08 2:32 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-16 1:21 linux-next: manual merge of the tip tree with the arm-soc tree Stephen Rothwell
2018-03-19 3:06 Stephen Rothwell
2018-04-02 23:48 ` Stephen Rothwell
2018-03-13 3:11 Stephen Rothwell
2015-07-28 2:20 Stephen Rothwell
2014-09-26 6:25 Stephen Rothwell
2014-09-29 18:12 ` Tony Lindgren
2014-03-28 3:50 Stephen Rothwell
2014-03-28 3:47 Stephen Rothwell
2014-03-28 3:39 Stephen Rothwell
2014-03-20 3:36 Stephen Rothwell
2014-04-02 0:47 ` Stephen Rothwell
2014-03-17 5:37 Stephen Rothwell
2014-03-17 5:35 Stephen Rothwell
2014-03-17 16:41 ` 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=20181008133158.773196b8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=afaerber@suse.de \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=hpa@zytor.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=mingo@elte.hu \
--cc=olof@lixom.net \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).