From: Bintian <bintian.wang@huawei.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Mike Turquette <mturquette@linaro.org>,
Stephen Boyd <sboyd@codeaurora.org>,
Shawn Guo <shawn.guo@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Huxinwei <huxinwei@huawei.com>
Subject: Re: linux-next: manual merge of the clk tree with the imx-mxs tree
Date: Fri, 29 May 2015 20:33:26 +0800 [thread overview]
Message-ID: <55685C96.5020702@huawei.com> (raw)
In-Reply-To: <20150529204553.3198ba2c@canb.auug.org.au>
Hello Stephen,
Thank you very much for this fix.
BR,
Bintian
On 2015/5/29 18:45, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/clk/Makefile between commit 33156149fc4a ("ARM: imx: move clock
> drivers into drivers/clk") from the imx-mxs tree and commit
> b1691707eccd ("clk: hi6220: Clock driver support for Hisilicon hi6220
> SoC") from the clk tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
WARNING: multiple messages have this Message-ID (diff)
From: Bintian <bintian.wang@huawei.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Mike Turquette <mturquette@linaro.org>,
Stephen Boyd <sboyd@codeaurora.org>,
Shawn Guo <shawn.guo@linaro.org>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Huxinwei <huxinwei@huawei.com>
Subject: Re: linux-next: manual merge of the clk tree with the imx-mxs tree
Date: Fri, 29 May 2015 20:33:26 +0800 [thread overview]
Message-ID: <55685C96.5020702@huawei.com> (raw)
In-Reply-To: <20150529204553.3198ba2c@canb.auug.org.au>
Hello Stephen,
Thank you very much for this fix.
BR,
Bintian
On 2015/5/29 18:45, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/clk/Makefile between commit 33156149fc4a ("ARM: imx: move clock
> drivers into drivers/clk") from the imx-mxs tree and commit
> b1691707eccd ("clk: hi6220: Clock driver support for Hisilicon hi6220
> SoC") from the clk tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
next prev parent reply other threads:[~2015-05-29 12:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-29 10:45 linux-next: manual merge of the clk tree with the imx-mxs tree Stephen Rothwell
2015-05-29 12:33 ` Bintian [this message]
2015-05-29 12:33 ` Bintian
-- strict thread matches above, loose matches on Subject: below --
2019-10-17 22:20 Stephen Rothwell
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=55685C96.5020702@huawei.com \
--to=bintian.wang@huawei.com \
--cc=huxinwei@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=sboyd@codeaurora.org \
--cc=sfr@canb.auug.org.au \
--cc=shawn.guo@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.