Hi Geert,
On Tue, 22 Nov 2016 10:36:46 +0100 Geert Uytterhoeven
wrote:
>
> Most of these are of the "add both sides" type.
> The only exception is the one in arch/arm/mach-shmobile/setup-rcar-gen2.c,
> where you just want to keep the call to of_clk_init(NULL);
>
> There's a resolution in
> http
Hi Stephen,
On Tue, Nov 22, 2016 at 9:41 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the clk tree got conflicts in:
>
> arch/arm/boot/dts/r8a7779.dtsi
> arch/arm/boot/dts/r8a7790.dtsi
> arch/arm/boot/dts/r8a7791.dtsi
> arch/arm/boot/dts/r8a7792.dtsi
> arch/arm/boot/dts/r8a
Hi all,
Today's linux-next merge of the clk tree got conflicts in:
arch/arm/boot/dts/r8a7779.dtsi
arch/arm/boot/dts/r8a7790.dtsi
arch/arm/boot/dts/r8a7791.dtsi
arch/arm/boot/dts/r8a7792.dtsi
arch/arm/boot/dts/r8a7793.dtsi
arch/arm/boot/dts/r8a7794.dtsi
arch/arm/mach-shmobile/setup-r
Le 01/03/2016 05:00, Stephen Rothwell a écrit :
> Hi all,
>
> On Tue, 1 Mar 2016 14:57:00 +1100 Stephen Rothwell
> 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 handl
Hi all,
On Tue, 1 Mar 2016 14:57:00 +1100 Stephen Rothwell
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:
Hi all,
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_cou
Quoting Stephen Rothwell (2015-02-02 21:31:40)
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> arch/arm/mach-omap2/cclock3xxx_data.c between commit ca662ee7b8a8
> ("ARM: OMAP2+: Remove unused ti81xx platform init code") from the
> arm-soc tree and commit d6540b193719 ("
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-omap2/cclock3xxx_data.c between commit ca662ee7b8a8
("ARM: OMAP2+: Remove unused ti81xx platform init code") from the
arm-soc tree and commit d6540b193719 ("ARM: OMAP3: remove legacy clock
data") from the clk tree.
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-omap2/io.c between commit c27964b5d2f3 ("ARM: OMAP2+: Fix
ti81xx class type") from the arm-soc tree and commit eded36fe29e1
("ARM: OMAP3: use clock data from TI clock driver for legacy boot")
from the clk tree.
I fi
On 26.01.2014 21:59, Tomasz Figa wrote:
Hi Stephen,
On 13.01.2014 06:06, Stephen Rothwell wrote:
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/samsung/clk-exynos4.c between commit 86576fbe201b ("clk:
samsung: exynos4: Fix definition of div_mmc_pre4 divider") f
Hi Stephen,
On 13.01.2014 06:06, Stephen Rothwell wrote:
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/samsung/clk-exynos4.c between commit 86576fbe201b ("clk:
samsung: exynos4: Fix definition of div_mmc_pre4 divider") from the
arm-soc tree and commit 2d7382375
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/samsung/clk-exynos4.c between commit 86576fbe201b ("clk:
samsung: exynos4: Fix definition of div_mmc_pre4 divider") from the
arm-soc tree and commit 2d7382375054 ("clk: exynos4: replace clock ID
private enums with IDs
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/tegra/clk-tegra114.c between commit 31972fd95527 ("clk:
tegra114: implement wait_for_reset and disable_clock for
tegra_cpu_car_ops") from the arm-soc tree and commit d53442e94db0 ("clk:
tegra: override bits for Tegra11
On Fri, 2013-04-19 at 08:27 +0100, Stephen Rothwell wrote:
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> arch/arm/mach-vexpress/v2m.c between commit dabfd8fb84ab ("ARM: vexpress:
> remove sp804 OF init") from the arm-soc tree and commit 6e973d2c4385
> ("clk: vexpress:
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-vexpress/v2m.c between commit dabfd8fb84ab ("ARM: vexpress:
remove sp804 OF init") from the arm-soc tree and commit 6e973d2c4385
("clk: vexpress: Add separate SP810 driver") from the clk tree.
I fixed it up (I thnk
Quoting Stephen Rothwell (2013-02-02 04:27:40)
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> include/asm-generic/vmlinux.lds.h between commit ae278a935f08
> ("clocksource: add common of_clksrc_init() function") from the arm-soc
> tree and commit f2f6c2556dcc ("clk: ad
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
include/asm-generic/vmlinux.lds.h between commit ae278a935f08
("clocksource: add common of_clksrc_init() function") from the arm-soc
tree and commit f2f6c2556dcc ("clk: add common of_clk_init() function")
from the clk tree.
I fix
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-ux500/cpu-db8500.c between commit e13316d60658 ("ARM:
ux500: Rename dbx500 cpufreq code to be more generic") from the arm-soc
tree and commit 50545e1d237b ("ARM: ux500: Remove cpufreq platform
device") from the clk t
On Tue, 2012-10-30 at 10:11 +, Mike Turquette wrote:
> > diff --cc arch/arm/include/asm/hardware/sp810.h
> > index 2cdcf44,afd7e91..000
> > --- a/arch/arm/include/asm/hardware/sp810.h
> > +++ b/arch/arm/include/asm/hardware/sp810.h
> > @@@ -50,6 -50,14 +50,8 @@@
> > #define SCPCELLID2
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/include/asm/hardware/sp810.h between commit 0891642cf117 ("ARM:
vexpress: Start using new Versatile Express infrastructure") from the
arm-soc tree and commit 05e3659135a4 ("clk: Common clocks implementation
for Versatile
Quoting Linus Walleij (2012-09-10 08:24:49)
> On Mon, Sep 10, 2012 at 8:14 AM, Stephen Rothwell
> wrote:
>
> > Today's linux-next merge of the clk tree got a conflict in
> > arch/arm/mach-ux500/clock.c between commit 79964bcd792f ("ARM: ux500:
> > Correct Ux500 family names usage") from the arm-
On Mon, Sep 10, 2012 at 8:14 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the clk tree got a conflict in
> arch/arm/mach-ux500/clock.c between commit 79964bcd792f ("ARM: ux500:
> Correct Ux500 family names usage") from the arm-soc tree and commit
> ebc96db7632f ("ARM: ux500: Switch t
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-ux500/clock.c between commit 79964bcd792f ("ARM: ux500:
Correct Ux500 family names usage") from the arm-soc tree and commit
ebc96db7632f ("ARM: ux500: Switch to use common clock framework") from
the clk tree.
The la
On 20120713-10:10, Rob Herring wrote:
>
>
> On 07/13/2012 12:14 AM, Stephen Rothwell wrote:
> > Hi Mike,
> >
> > Today's linux-next merge of the clk tree got a conflict in
> > drivers/clk/Makefile between commit 4a31bd28e86a ("ARM: nomadik: convert
> > to generic clock") from the arm-soc tree an
On 07/13/2012 12:14 AM, Stephen Rothwell wrote:
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/clk/Makefile between commit 4a31bd28e86a ("ARM: nomadik: convert
> to generic clock") from the arm-soc tree and commit 8d4d9f52081c ("clk:
> add highbank clock supp
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/Makefile between commit 4a31bd28e86a ("ARM: nomadik: convert
to generic clock") from the arm-soc tree and commit 8d4d9f52081c ("clk:
add highbank clock support") from the clk tree.
Just context changes. I fixed it up
26 matches
Mail list logo
