From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alexandre Belloni <alexandre.belloni@bootlin•com>,
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>,
"Michał Mirosław" <mirq-linux@rere•qmqm.pl>
Subject: linux-next: manual merge of the rtc tree with the clk tree
Date: Mon, 11 Feb 2019 16:17:31 +1100 [thread overview]
Message-ID: <20190211161731.56897159@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
Hi all,
Today's linux-next merge of the rtc tree got a conflict in:
drivers/clk/at91/sama5d2.c
between commit:
77977b800451 ("clk: at91: enable AUDIOPLL as source for PCKx on SAMA5D2")
from the clk tree and commit:
34d2ff2a6019 ("clk: at91: fix masterck name")
from the rtc 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 drivers/clk/at91/sama5d2.c
index ade063622531,cd0ef7274fdb..000000000000
--- a/drivers/clk/at91/sama5d2.c
+++ b/drivers/clk/at91/sama5d2.c
@@@ -240,8 -240,7 +240,8 @@@ static void __init sama5d2_pmc_setup(st
parent_names[1] = "mainck";
parent_names[2] = "plladivck";
parent_names[3] = "utmick";
- parent_names[4] = "mck";
+ parent_names[4] = "masterck";
+ parent_names[5] = "audiopll_pmcck";
for (i = 0; i < 3; i++) {
char name[6];
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-02-11 5:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-11 5:17 Stephen Rothwell [this message]
[not found] ` <155000535897.115909.9366893166102514791@swboyd.mtv.corp.google.com>
2019-02-12 21:14 ` linux-next: manual merge of the rtc tree with the clk tree Alexandre Belloni
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=20190211161731.56897159@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexandre.belloni@bootlin$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mirq-linux@rere$(echo .)qmqm.pl \
--cc=mturquette@baylibre$(echo .)com \
--cc=sboyd@codeaurora$(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