From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Chen-Yu Tsai <wens@csie.org>
Subject: linux-next: manual merge of the clk tree with the sunxi tree
Date: Tue, 1 Mar 2016 15:07:00 +1100 [thread overview]
Message-ID: <20160301150700.650fbd3e@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/sunxi/clk-sun6i-ar100.c
between commit:
3ca2377b6fed ("clk: sunxi: rewrite sun6i-ar100 using factors clk")
from the sunxi tree and commit:
36bf2811416c ("clk: sunxi: Use proper type for of_clk_get_parent_count() return value")
from the clk tree.
I fixed it up (the former removed the code updated by the latter) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell
reply other threads:[~2016-03-01 4:07 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=20160301150700.650fbd3e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.org \
--cc=wens@csie.org \
/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).