From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Stephen Boyd <sboyd@kernel.org>
Cc: "Mike Turquette" <mturquette@baylibre.com>,
"Stephen Boyd" <sboyd@codeaurora.org>,
"Stephen Rothwell" <sfr@canb.auug.org.au>,
"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: Re: linux-next: manual merge of the rtc tree with the clk tree
Date: Tue, 12 Feb 2019 22:14:47 +0100 [thread overview]
Message-ID: <20190212211447.GB10129@piout.net> (raw)
In-Reply-To: <155000535897.115909.9366893166102514791@swboyd.mtv.corp.google.com>
Hi Stephen and Stephen,
On 12/02/2019 13:02:38-0800, Stephen Boyd wrote:
> Quoting Stephen Rothwell (2019-02-10 21:17:31)
> > 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.
> >
>
> Thanks. Looks good to me.
Actually, that was my mistake and I removed it from the RTC tree. I'm
really intending for "clk: at91: fix masterck name" to go through the
clk tree. I simply forgot to remove the patch from this branch after
testing it...
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
prev parent reply other threads:[~2019-02-12 21:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-11 5:17 linux-next: manual merge of the rtc tree with the clk tree Stephen Rothwell
[not found] ` <155000535897.115909.9366893166102514791@swboyd.mtv.corp.google.com>
2019-02-12 21:14 ` Alexandre Belloni [this message]
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=20190212211447.GB10129@piout.net \
--to=alexandre.belloni@bootlin.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.org \
--cc=sboyd@kernel.org \
--cc=sfr@canb.auug.org.au \
/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).