From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Boris BREZILLON <boris.brezillon@free-electrons.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Tue, 1 Mar 2016 09:38:30 +0100 [thread overview]
Message-ID: <56D55506.4050007@atmel.com> (raw)
In-Reply-To: <20160301150054.2cb0e728@canb.auug.org.au>
Le 01/03/2016 05:00, Stephen Rothwell a écrit :
> Hi all,
>
> On Tue, 1 Mar 2016 14:57:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the clk tree got a conflict in:
>>
>> drivers/clk/at91/clk-main.c
>>
>> between commit:
>>
>> 99a81706526f ("clk: at91: remove IRQ handling and use polling")
>>
>> from the arm-soc tree and commit:
>>
>> 8c1b1e54faed ("clk: at91: Remove impossible checks for of_clk_get_parent_count()")
>>
>> from the clk tree.
>
> And the same for drivers/clk/at91/clk-master.c
Stephen,
Both fixes seem good. Thanks!
Bye,
--
Nicolas Ferre
WARNING: multiple messages have this Message-ID (diff)
From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Tue, 1 Mar 2016 09:38:30 +0100 [thread overview]
Message-ID: <56D55506.4050007@atmel.com> (raw)
In-Reply-To: <20160301150054.2cb0e728@canb.auug.org.au>
Le 01/03/2016 05:00, Stephen Rothwell a ?crit :
> Hi all,
>
> On Tue, 1 Mar 2016 14:57:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the clk tree got a conflict in:
>>
>> drivers/clk/at91/clk-main.c
>>
>> between commit:
>>
>> 99a81706526f ("clk: at91: remove IRQ handling and use polling")
>>
>> from the arm-soc tree and commit:
>>
>> 8c1b1e54faed ("clk: at91: Remove impossible checks for of_clk_get_parent_count()")
>>
>> from the clk tree.
>
> And the same for drivers/clk/at91/clk-master.c
Stephen,
Both fixes seem good. Thanks!
Bye,
--
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@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>,
"Olof Johansson" <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Boris BREZILLON <boris.brezillon@free-electrons.com>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Tue, 1 Mar 2016 09:38:30 +0100 [thread overview]
Message-ID: <56D55506.4050007@atmel.com> (raw)
In-Reply-To: <20160301150054.2cb0e728@canb.auug.org.au>
Le 01/03/2016 05:00, Stephen Rothwell a écrit :
> Hi all,
>
> On Tue, 1 Mar 2016 14:57:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the clk tree got a conflict in:
>>
>> drivers/clk/at91/clk-main.c
>>
>> between commit:
>>
>> 99a81706526f ("clk: at91: remove IRQ handling and use polling")
>>
>> from the arm-soc tree and commit:
>>
>> 8c1b1e54faed ("clk: at91: Remove impossible checks for of_clk_get_parent_count()")
>>
>> from the clk tree.
>
> And the same for drivers/clk/at91/clk-master.c
Stephen,
Both fixes seem good. Thanks!
Bye,
--
Nicolas Ferre
next prev parent reply other threads:[~2016-03-01 8:38 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 3:57 linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell
2016-03-01 3:57 ` Stephen Rothwell
2016-03-01 3:57 ` Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 8:38 ` Nicolas Ferre [this message]
2016-03-01 8:38 ` Nicolas Ferre
2016-03-01 8:38 ` Nicolas Ferre
-- strict thread matches above, loose matches on Subject: below --
2024-07-11 23:58 Stephen Rothwell
2024-07-12 7:00 ` Drew Fustini
2016-11-22 8:41 Stephen Rothwell
2016-11-22 8:41 ` Stephen Rothwell
2016-11-22 9:36 ` Geert Uytterhoeven
2016-11-22 9:36 ` Geert Uytterhoeven
2016-11-22 23:59 ` Stephen Rothwell
2016-11-22 23:59 ` Stephen Rothwell
2015-02-03 5:31 Stephen Rothwell
2015-02-03 5:31 ` Stephen Rothwell
2015-02-03 5:31 ` Stephen Rothwell
2015-02-03 18:25 ` Mike Turquette
2015-02-03 18:25 ` Mike Turquette
2015-02-03 5:28 Stephen Rothwell
2015-02-03 5:28 ` Stephen Rothwell
2015-02-03 5:28 ` Stephen Rothwell
2014-01-13 5:06 Stephen Rothwell
2014-01-13 5:06 ` Stephen Rothwell
2014-01-13 5:06 ` Stephen Rothwell
2014-01-26 20:59 ` Tomasz Figa
2014-01-26 20:59 ` Tomasz Figa
2014-01-26 21:05 ` Tomasz Figa
2014-01-26 21:05 ` Tomasz Figa
2013-06-17 7:27 Stephen Rothwell
2013-06-17 7:27 ` Stephen Rothwell
2013-06-17 7:27 ` Stephen Rothwell
2013-06-17 18:49 ` Mike Turquette
2013-06-17 18:49 ` Mike Turquette
2013-04-19 7:27 Stephen Rothwell
2013-04-19 7:27 ` Stephen Rothwell
2013-04-19 7:27 ` Stephen Rothwell
2013-04-19 9:47 ` Pawel Moll
2013-04-19 9:47 ` Pawel Moll
2013-02-02 12:27 Stephen Rothwell
2013-02-02 12:27 ` Stephen Rothwell
2013-02-02 12:27 ` Stephen Rothwell
2013-02-04 17:54 ` Mike Turquette
2013-02-04 17:54 ` Mike Turquette
2012-11-28 6:12 Stephen Rothwell
2012-11-28 6:12 ` Stephen Rothwell
2012-11-28 6:12 ` Stephen Rothwell
2012-10-30 4:06 Stephen Rothwell
2012-10-30 4:06 ` Stephen Rothwell
2012-10-30 4:06 ` Stephen Rothwell
2012-10-30 10:11 ` Mike Turquette
2012-10-30 10:11 ` Mike Turquette
2012-10-30 10:39 ` Pawel Moll
2012-10-30 10:39 ` Pawel Moll
2012-09-10 6:14 Stephen Rothwell
2012-09-10 6:14 ` Stephen Rothwell
2012-09-10 6:14 ` Stephen Rothwell
2012-09-10 15:24 ` Linus Walleij
2012-09-10 15:24 ` Linus Walleij
2012-09-10 16:51 ` Mike Turquette
2012-09-10 16:51 ` Mike Turquette
2012-07-13 5:14 Stephen Rothwell
2012-07-13 5:14 ` Stephen Rothwell
2012-07-13 5:14 ` Stephen Rothwell
2012-07-13 15:10 ` Rob Herring
2012-07-13 15:10 ` Rob Herring
2012-07-13 17:27 ` Mike Turquette
2012-07-13 17:27 ` Mike Turquette
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=56D55506.4050007@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=arnd@arndb.de \
--cc=boris.brezillon@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=olof@lixom.net \
--cc=sboyd@codeaurora.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.