From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Mike Turquette <mturquette@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Boris BREZILLON <b.brezillon@overkiz.com>
Subject: Re: linux-next: manual merge of the clk tree with Linus' tree
Date: Wed, 29 Jan 2014 09:53:18 +0100 [thread overview]
Message-ID: <52E8C17E.4050002@atmel.com> (raw)
In-Reply-To: <20140129142551.6e6e27fc1a9440c762370af1@canb.auug.org.au>
On 29/01/2014 04:25, Stephen Rothwell :
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> base support") from Linus' tree and commit fd3fdaf09f26 ("clk: sort
> Makefile") from the clk tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Your fix is correct. Thanks Stephen.
Best regards,
--
Nicolas Ferre
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Mike Turquette <mturquette@linaro.org>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Boris BREZILLON" <b.brezillon@overkiz.com>
Subject: Re: linux-next: manual merge of the clk tree with Linus' tree
Date: Wed, 29 Jan 2014 09:53:18 +0100 [thread overview]
Message-ID: <52E8C17E.4050002@atmel.com> (raw)
In-Reply-To: <20140129142551.6e6e27fc1a9440c762370af1@canb.auug.org.au>
On 29/01/2014 04:25, Stephen Rothwell :
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> base support") from Linus' tree and commit fd3fdaf09f26 ("clk: sort
> Makefile") from the clk tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Your fix is correct. Thanks Stephen.
Best regards,
--
Nicolas Ferre
next prev parent reply other threads:[~2014-01-29 8:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 3:25 linux-next: manual merge of the clk tree with Linus' tree Stephen Rothwell
2014-01-29 8:53 ` Nicolas Ferre [this message]
2014-01-29 8:53 ` Nicolas Ferre
-- strict thread matches above, loose matches on Subject: below --
2022-03-29 22:07 Stephen Rothwell
2019-06-06 23:13 Stephen Rothwell
2017-07-24 0:37 Stephen Rothwell
2015-02-20 0:17 Stephen Rothwell
2013-08-27 9:03 Stephen Rothwell
2013-08-27 10:09 ` James Hogan
2013-08-27 10:09 ` James Hogan
2013-08-27 15:44 ` Sören Brinkmann
2013-08-27 15:44 ` Sören Brinkmann
2013-08-27 16:53 ` Mike Turquette
2013-08-27 16:53 ` Mike Turquette
2013-08-28 0:04 ` Stephen Rothwell
2013-08-28 7:22 ` Stephen Rothwell
2013-08-28 8:05 ` James Hogan
2013-08-28 15:48 ` Sören Brinkmann
2013-08-28 15:48 ` 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=52E8C17E.4050002@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=b.brezillon@overkiz.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@linaro.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 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.