Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/imx/clk-imx8mn.c
between commit:
0ae4fbc63c31 ("clk: imx8mn: Use common 1443X/1416X PLL clock structure")
from the imx-mxs tree and commit:
727e12cde9f6 ("clk: imx: imx8mn: drop unused pll enum")
from the c
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/bcm/Kconfig
between commit:
ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig")
from Linus' tree and commit:
5d59f12a19e6 ("clk: bcm: Make BCM2835 clock drivers selectable")
from the c
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
MAINTAINERS
between commit:
82abbea734d6 ("MAINTAINERS: fix alphabetical ordering")
from Linus' tree and commit:
6d7489c74a6e ("clk: axs10x: introduce AXS10X pll driver")
from the clk tree.
I fixed it up (see below) a
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
MAINTAINERS
between commits:
18a006203b88 ("dt-bindings: reset: Add TI SCI reset binding")
28df169b9afa ("reset: Add the TI SCI reset driver")
from the reset tree and commits:
8f306cfe4383 ("Documentation: dt: Add TI
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
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/Kconfig
between commit:
ce6e11884659 ("CLK: microchip: Add Microchip PIC32 clock driver.")
from the mips tree and commit:
0bbd72b4c64f ("clk: Add Oxford Semiconductor OXNAS Standard Clocks")
from the clk tr
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,
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_cou
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
On 16.02.2016 13:11, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the clk tree got a conflict in:
>
> drivers/clk/Kconfig
> drivers/clk/samsung/Kconfig
>
> between commit:
>
> fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks")
>
> from the samsung-
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/Kconfig
drivers/clk/samsung/Kconfig
between commit:
fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks")
from the samsung-krzk tree and commit:
b9e65ebc654d ("clk: Move vendor's Kconfig in
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/Kconfig
between commit:
9e19ca2f627e ("clk: qoriq: Add ls2080a support.")
from the fsl tree and commit:
4a7748c3d641 ("clk: Allow drivers to build if COMPILE_TEST is enabled")
from the clk tree.
I fixed it
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
between commit:
bdbc06e2309b ("drm/msm/dsi: Save/Restore PLL status across PHY reset")
from the drm-msm tree and commit:
3dde2c2b968a ("drm/msm/dsi: Convert to clk_hw based pro
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/ti/Makefile
between commit:
9cf705de06a2 ("ARM: OMAP2+: Add support for initializing dm814x clocks")
from the omap tree and commit:
0565fb168d63 ("clk: ti: dpll: move omap3 DPLL functionality to clock driver
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
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 f
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/powerpc/configs/corenet32_smp_defconfig between commit
a85cade6762b ("powerpc: Update all configs using savedefconfig") from
the tree and commit 8f0ab1e14139 ("powerpc/corenet: Enable CLK_QORIQ")
from the clk tree.
I fixed
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
Quoting Stephen Rothwell (2014-09-10 00:33:35)
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> between commit b32c44b93af3 ("clk: shmobile: Add r8a7740, sh73a0 SoCs
> to MSTP bindings") from the renes
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
between commit b32c44b93af3 ("clk: shmobile: Add r8a7740, sh73a0 SoCs
to MSTP bindings") from the renesas tree and commit 5acb7bbbab7c ("ARM:
shmobile: r8a7794: d
Quoting Stephen Rothwell (2014-07-30 01:57:08)
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/base/platform.c between commit 3d713e0e382e ("driver core:
> platform: add device binding path 'driver_override'") from the
> driver-core tree and commit 86be408bfbd8
On Wed, Jul 30, 2014 at 06:57:08PM +1000, Stephen Rothwell wrote:
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/base/platform.c between commit 3d713e0e382e ("driver core:
> platform: add device binding path 'driver_override'") from the
> driver-core tree and c
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/base/platform.c between commit 3d713e0e382e ("driver core:
platform: add device binding path 'driver_override'") from the
driver-core tree and commit 86be408bfbd8 ("clk: Support for clock
parents and rates assigned from de
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/mmc/host/Makefile between commit 1b66e94e6b99 ("mmc: moxart:
Add MOXA ART SD/MMC driver") from the mmc tree and commit 3cbcb16095f9
("mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi
SoCs") from the clk tre
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/mmc/host/Kconfig between commit c7f6558d84af ("mmc: Add realtek
USB sdmmc host driver") from the mmc tree and commit 3cbcb16095f9
("mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi
SoCs") from the clk tree.
Quoting Stephen Rothwell (2014-05-14 23:11:21)
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> between commit b557deadc5cc ("ARM: shmobile: r7s72100: document MSTP
> clock support") from the renesas t
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
between commit b557deadc5cc ("ARM: shmobile: r7s72100: document MSTP
clock support") from the renesas tree and commit 5483bf698f42 ("clk:
shmobile: r8a7779: Add M
: Re: linux-next: manual merge of the clk tree with the keystone tree
>
>
>On 02/26/2014 09:15 AM, Stephen Rothwell wrote:
>> Hi Mike,
>>
>> Today's linux-next merge of the clk tree got a conflict in
>> arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc
On Wednesday 26 February 2014 06:41 AM, Khoronzhuk, Ivan wrote:
>
> On 02/26/2014 09:15 AM, Stephen Rothwell wrote:
>> Hi Mike,
>>
>> Today's linux-next merge of the clk tree got a conflict in
>> arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc9ccec2a8 ("ARM:
>> dts: keystone: preparator
On 02/26/2014 09:15 AM, Stephen Rothwell wrote:
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc9ccec2a8 ("ARM:
dts: keystone: preparatory patch to support K2L and K2E SOCs") from the
keystone tree and commit 565bbdcd
On Tue, Feb 25, 2014 at 11:15 PM, Stephen Rothwell
wrote:
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc9ccec2a8 ("ARM:
> dts: keystone: preparatory patch to support K2L and K2E SOCs") from the
> keystone tree
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc9ccec2a8 ("ARM:
dts: keystone: preparatory patch to support K2L and K2E SOCs") from the
keystone tree and commit 565bbdcd3b91 ("ARM: keystone: dts: fix clkvcp3
control regi
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 fix
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
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 MAINTAINERS
between commit 7d459937dc09 ("[media] Add driver for Samsung S5K5BAF
camera sensor") from the v4l-dvb tree and commit 310e39c9b320
("MAINTAINERS: Add entry for Samsung SoC clock drivers") from the clk
tree.
I fixed it
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/Makefile
caused by commits f00578d (clk: emev2: Add support for emev2 SMU clocks
with DT), 6cfc229 (clk: keystone: Build Keystone clock drivers) and
308964c (clk: Add APM X-Gene SoC clock driver).
I fixed it up (see b
On Wed, Aug 28, 2013 at 05:22:25PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Wed, 28 Aug 2013 10:04:31 +1000 Stephen Rothwell
> wrote:
> >
> > On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette
> > wrote:
> > >
> > > Quoting Sören Brinkmann (2013-08-27 08:44:11)
> > > > On Tue, Aug 27, 20
Hi Stephen
On 28/08/13 08:22, Stephen Rothwell wrote:
> On Wed, 28 Aug 2013 10:04:31 +1000 Stephen Rothwell
> wrote:
>> >
>> > On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette
>> > wrote:
>>> > >
>>> > > Quoting Sören Brinkmann (2013-08-27 08:44:11)
> > > On Tue, Aug 27, 2013 at 11:09:52
Hi all,
On Wed, 28 Aug 2013 10:04:31 +1000 Stephen Rothwell
wrote:
>
> On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette
> wrote:
> >
> > Quoting Sören Brinkmann (2013-08-27 08:44:11)
> > > On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
> > > > On 27/08/13 10:03, Stephen Rothwell
Hi all,
On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette wrote:
>
> Quoting Sören Brinkmann (2013-08-27 08:44:11)
> > On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
> > > On 27/08/13 10:03, Stephen Rothwell wrote:
> > > > Hi Mike,
> > > >
> > > > Today's linux-next merge of the cl
Quoting Sören Brinkmann (2013-08-27 08:44:11)
> On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
> > On 27/08/13 10:03, Stephen Rothwell wrote:
> > > Hi Mike,
> > >
> > > Today's linux-next merge of the clk tree got a conflict in
> > > drivers/clk/zynq/clkc.c between commits 252957cc3a
On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
> On 27/08/13 10:03, Stephen Rothwell wrote:
> > Hi Mike,
> >
> > Today's linux-next merge of the clk tree got a conflict in
> > drivers/clk/zynq/clkc.c between commits 252957cc3a2d ("clk/zynq/clkc: Add
> > dedicated spinlock for the SWD
On 27/08/13 10:03, Stephen Rothwell wrote:
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/clk/zynq/clkc.c between commits 252957cc3a2d ("clk/zynq/clkc: Add
> dedicated spinlock for the SWDT") and 765b7d4c4cb3
> ("clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to e
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/zynq/clkc.c between commits 252957cc3a2d ("clk/zynq/clkc: Add
dedicated spinlock for the SWDT") and 765b7d4c4cb3
("clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes") from
Linus' tree and commit 819c1de344c
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/samsung/clk-exynos4.c between commit 6082f908b060 ("clk:
exynos4: Staticize local symbols") from the samsung tree and commit
82ba93b27cf5 ("clk: exynos4: Fix clock aliases for cpufreq related
clocks") from the clk tree
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
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/mvebu/clk-core.c between commit 07f42258893d ("treewide: Fix
typos in printk") from the trivial tree and commit 4cb24e68a5af ("clk:
mvebu: Fix valid value range checking for cpu_freq_select") from the clk
tree.
I fixe
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
68 matches
Mail list logo
