Re: [GIT PULL] clk: changes for 3.14, part 2
On Tue, Jan 28, 2014 at 6:44 PM, Linus Torvalds wrote: > On Mon, Jan 27, 2014 at 1:43 PM, Mike Turquette wrote: >> >> git://git.linaro.org/people/mike.turquette/linux.git >> tags/clk-for-linus-3.14-part2 > > Dammit, this is pure shit, and after having to deal with yet another > pointless merge conflict due to stupid "cleanups" in Makefiles, IT > DOES NOT EVEN COMPILE. > > drivers/clk/clk-si5351.c: In function 'si5351_i2c_probe': > drivers/clk/clk-si5351.c:1314:2: error: too many arguments to function > 'si5351_dt_parse' > ret = si5351_dt_parse(client, variant); > ^ > drivers/clk/clk-si5351.c:1296:12: note: declared here > static int si5351_dt_parse(struct i2c_client *client) > > And no, that's not due to a merge error of mine. It was that way in your tree. > > Hulk angry. Hulk smash. My apologies for making you hulk out. I did sneak some stuff in at the end and it bit us in the ass. Thank you for fixing it up. > > I fixed it up in the merge, but I shouldn't need to. This should have > been caught in -next, and even if you compile for ARM as your primary > target, I know *damn* well that no sane ARM developer actually > compiles *on* ARM (because there are no machines where it's worth the > pain), so you should make sure that the x86-64 build works too. > > If I can find compile errors within a couple of minutes of pulling and > it's not a merge error of mine, the tree I'm pulling from is clearly > crap. > > So I'm more than a bit grumpy. Get your act together, and don't send > me any more shit. > > In fact, I would suggest you send nothing but obvious fixes from now > on in this release. Because I won't be taking anything else. I only send fixes for actual regressions after -rc1. Additionally this weird two-part pull request was an anomaly and I don't plan to do it again. Again thanks for your patience, Mike > > Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] clk: changes for 3.14, part 2
On Tue, 28 Jan 2014 18:44:31 -0800 Linus Torvalds wrote: > > On Mon, Jan 27, 2014 at 1:43 PM, Mike Turquette wrote: > > > > git://git.linaro.org/people/mike.turquette/linux.git > > tags/clk-for-linus-3.14-part2 > > I fixed it up in the merge, but I shouldn't need to. This should have > been caught in -next, and even if you compile for ARM as your primary Yes, it probably will be when I get to that tree today as those last 6 commits only hit here today. :-( -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp_c1LL3ijjm.pgp Description: PGP signature
Re: [GIT PULL] clk: changes for 3.14, part 2
On Mon, Jan 27, 2014 at 1:43 PM, Mike Turquette wrote: > > git://git.linaro.org/people/mike.turquette/linux.git > tags/clk-for-linus-3.14-part2 Dammit, this is pure shit, and after having to deal with yet another pointless merge conflict due to stupid "cleanups" in Makefiles, IT DOES NOT EVEN COMPILE. drivers/clk/clk-si5351.c: In function ‘si5351_i2c_probe’: drivers/clk/clk-si5351.c:1314:2: error: too many arguments to function ‘si5351_dt_parse’ ret = si5351_dt_parse(client, variant); ^ drivers/clk/clk-si5351.c:1296:12: note: declared here static int si5351_dt_parse(struct i2c_client *client) And no, that's not due to a merge error of mine. It was that way in your tree. Hulk angry. Hulk smash. I fixed it up in the merge, but I shouldn't need to. This should have been caught in -next, and even if you compile for ARM as your primary target, I know *damn* well that no sane ARM developer actually compiles *on* ARM (because there are no machines where it's worth the pain), so you should make sure that the x86-64 build works too. If I can find compile errors within a couple of minutes of pulling and it's not a merge error of mine, the tree I'm pulling from is clearly crap. So I'm more than a bit grumpy. Get your act together, and don't send me any more shit. In fact, I would suggest you send nothing but obvious fixes from now on in this release. Because I won't be taking anything else. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] clk: changes for 3.14, part 2
On Mon, Jan 27, 2014 at 1:43 PM, Mike Turquette mturque...@linaro.org wrote: git://git.linaro.org/people/mike.turquette/linux.git tags/clk-for-linus-3.14-part2 Dammit, this is pure shit, and after having to deal with yet another pointless merge conflict due to stupid cleanups in Makefiles, IT DOES NOT EVEN COMPILE. drivers/clk/clk-si5351.c: In function ‘si5351_i2c_probe’: drivers/clk/clk-si5351.c:1314:2: error: too many arguments to function ‘si5351_dt_parse’ ret = si5351_dt_parse(client, variant); ^ drivers/clk/clk-si5351.c:1296:12: note: declared here static int si5351_dt_parse(struct i2c_client *client) And no, that's not due to a merge error of mine. It was that way in your tree. Hulk angry. Hulk smash. I fixed it up in the merge, but I shouldn't need to. This should have been caught in -next, and even if you compile for ARM as your primary target, I know *damn* well that no sane ARM developer actually compiles *on* ARM (because there are no machines where it's worth the pain), so you should make sure that the x86-64 build works too. If I can find compile errors within a couple of minutes of pulling and it's not a merge error of mine, the tree I'm pulling from is clearly crap. So I'm more than a bit grumpy. Get your act together, and don't send me any more shit. In fact, I would suggest you send nothing but obvious fixes from now on in this release. Because I won't be taking anything else. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] clk: changes for 3.14, part 2
On Tue, 28 Jan 2014 18:44:31 -0800 Linus Torvalds torva...@linux-foundation.org wrote: On Mon, Jan 27, 2014 at 1:43 PM, Mike Turquette mturque...@linaro.org wrote: git://git.linaro.org/people/mike.turquette/linux.git tags/clk-for-linus-3.14-part2 I fixed it up in the merge, but I shouldn't need to. This should have been caught in -next, and even if you compile for ARM as your primary Yes, it probably will be when I get to that tree today as those last 6 commits only hit here today. :-( -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp_c1LL3ijjm.pgp Description: PGP signature
Re: [GIT PULL] clk: changes for 3.14, part 2
On Tue, Jan 28, 2014 at 6:44 PM, Linus Torvalds torva...@linux-foundation.org wrote: On Mon, Jan 27, 2014 at 1:43 PM, Mike Turquette mturque...@linaro.org wrote: git://git.linaro.org/people/mike.turquette/linux.git tags/clk-for-linus-3.14-part2 Dammit, this is pure shit, and after having to deal with yet another pointless merge conflict due to stupid cleanups in Makefiles, IT DOES NOT EVEN COMPILE. drivers/clk/clk-si5351.c: In function 'si5351_i2c_probe': drivers/clk/clk-si5351.c:1314:2: error: too many arguments to function 'si5351_dt_parse' ret = si5351_dt_parse(client, variant); ^ drivers/clk/clk-si5351.c:1296:12: note: declared here static int si5351_dt_parse(struct i2c_client *client) And no, that's not due to a merge error of mine. It was that way in your tree. Hulk angry. Hulk smash. My apologies for making you hulk out. I did sneak some stuff in at the end and it bit us in the ass. Thank you for fixing it up. I fixed it up in the merge, but I shouldn't need to. This should have been caught in -next, and even if you compile for ARM as your primary target, I know *damn* well that no sane ARM developer actually compiles *on* ARM (because there are no machines where it's worth the pain), so you should make sure that the x86-64 build works too. If I can find compile errors within a couple of minutes of pulling and it's not a merge error of mine, the tree I'm pulling from is clearly crap. So I'm more than a bit grumpy. Get your act together, and don't send me any more shit. In fact, I would suggest you send nothing but obvious fixes from now on in this release. Because I won't be taking anything else. I only send fixes for actual regressions after -rc1. Additionally this weird two-part pull request was an anomaly and I don't plan to do it again. Again thanks for your patience, Mike Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] clk: changes for 3.14, part 2
The following changes since commit d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc:
Linux 3.13-rc7 (2014-01-04 15:12:14 -0800)
are available in the git repository at:
git://git.linaro.org/people/mike.turquette/linux.git
tags/clk-for-linus-3.14-part2
for you to fetch changes up to fd3fdaf09f26cd4f53fd4d7cdfe8e3dbb55a4dda:
clk: sort Makefile (2014-01-27 13:16:37 -0800)
The second half of the clock framework pull requeust for 3.14 is
dominated by platform support for Qualcomm's MSM SoCs, DT binding
updates for TI's OMAP-ish processors and additional support for Samsung
chips. Additionally there are other smaller clock driver changes and
several last minute fixes. This pull request also includes the HiSilicon
support that depends on the already-merged arm-soc pull request.
Abhilash Kesavan (4):
clk: samsung: exynos5250: Fix ACP gate register offset
clk: samsung: exynos5250: Add MDMA0 clocks
ARM: dts: exynos5250: Fix MDMA0 clock number
clk: samsung: exynos5250: Add CLK_IGNORE_UNUSED flag for the sysreg clock
Alex Elder (1):
clk: clean up everything on debugfs error
Alexandre Courbot (1):
clk: tegra: add FUSE clock device
Andrew Bresticker (8):
clk: exynos5250: fix sysmmu_mfc{l,r} gate clocks
clk: exynos5250: register APLL rate table
clk: exynos-audss: convert to platform device
clk: exynos-audss: allow input clocks to be specified in device tree
clk: exynos5250: add clock ID for div_pcm0
ARM: dts: exynos5250: add input clocks to audss clock controller
clk: exynos-audss: add support for Exynos 5420
ARM: dts: exynos5420: add input clocks to audss clock controller
Andrew Chew (1):
clk: tegra: Set the clk parent of host1x to pll_p
Andrzej Hajda (8):
ARM: exynos4: create a DT header defining CLK IDs
clk: exynos4: replace clock ID private enums with IDs from DT header
ARM: exynos5250: create a DT header defining CLK IDs
clk: exynos5250: replace clock ID private enums with IDs from DT header
ARM: exynos5420: create a DT header defining CLK IDs
clk: exynos5420: replace clock ID private enums with IDs from DT header
ARM: exynos5440: create a DT header defining CLK IDs
clk: exynos5440: replace clock ID private enums with IDs from DT header
Barry Song (1):
clk: sirf: re-arch to make the codes support both prima2 and atlas6
Boris BREZILLON (2):
clk: add clk accuracy retrieval support
clk: add accuracy support for fixed clock
Chander Kashyap (1):
clk: exynos5420: fix cpll clock register offsets
Chen-Yu Tsai (1):
clk: sunxi: Allwinner A20 output clock support
Dinh Nguyen (1):
clk: socfpga: Remove check for "reg" property in socfpga_clk_init
Emilio López (12):
clk: composite: .determine_rate support
clk: sunxi: factors: fix off-by-one masks
clk: sunxi: factors: clear variables before using them
clk: sunxi: protect core clocks from accidental shutdown
clk: sunxi: register factors clocks behind composite
clk: sunxi: clean the magic number of mux parents
clk: sunxi: add gating support to PLL1
clk: sunxi: make factors_clk_setup return the clock it registers
clk: sunxi: add PLL5 and PLL6 support
clk: sunxi: mod0 support
clk: sunxi: support better factor DT nodes
clk: sunxi: fix overflow when setting up divided factors
Ezequiel Garcia (2):
clk: mvebu: Add Core Divider clock
clk: fixed-factor: Fix device-tree binding typo
Grygorii Strashko (1):
clk: keystone: gate: fix error handling on init
Haojian Zhuang (3):
clk: hisilicon: add common clock support
clk: hi3620: fix wrong flags on divider
clk: hi3620: add gate clock flag
J Keerthy (4):
CLK: TI: DRA7: Add APLL support
ARM: dts: clk: Add apll related clocks
ARM: dts: DRA7: Change apll_pcie_m2_ck to fixed factor clock
ARM: dts: DRA7: Add PCIe related clock nodes
Jisheng Zhang (1):
clk: mvebu: staticize of_cpu_clk_setup
Joseph Lo (2):
clk: tegra124: add wait_for_reset and disable_clock for tegra_cpu_car_ops
clk: tegra124: add suspend/resume function for tegra_cpu_car_ops
Krzysztof Kozlowski (1):
clk: exynos: File scope reg_save array should depend on PM_SLEEP
Laurent Pinchart (3):
clk: shmobile: Add R-Car Gen2 clocks support
clk: shmobile: Add DIV6 clock support
clk: shmobile: Add MSTP clock support
Mark Zhang (3):
clk: tegra: Correct sbc mux width & parent
clk: tegra: Fix vde/2d/3d clock src offset
clk: tegra: Set the clock parent of gr2d/gr3d to pll_c2
Mike Turquette (17):
Merge tag 'sunxi-clk-for-3.13' of https://github.com/mripard/linux into
clk-next-sunxi-rebase
Merge branch 'clk-tegra-next' of
git://nv-tegra.nvidia.com/user/pdeschrijver/linux into
[GIT PULL] clk: changes for 3.14, part 2
The following changes since commit d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc:
Linux 3.13-rc7 (2014-01-04 15:12:14 -0800)
are available in the git repository at:
git://git.linaro.org/people/mike.turquette/linux.git
tags/clk-for-linus-3.14-part2
for you to fetch changes up to fd3fdaf09f26cd4f53fd4d7cdfe8e3dbb55a4dda:
clk: sort Makefile (2014-01-27 13:16:37 -0800)
The second half of the clock framework pull requeust for 3.14 is
dominated by platform support for Qualcomm's MSM SoCs, DT binding
updates for TI's OMAP-ish processors and additional support for Samsung
chips. Additionally there are other smaller clock driver changes and
several last minute fixes. This pull request also includes the HiSilicon
support that depends on the already-merged arm-soc pull request.
Abhilash Kesavan (4):
clk: samsung: exynos5250: Fix ACP gate register offset
clk: samsung: exynos5250: Add MDMA0 clocks
ARM: dts: exynos5250: Fix MDMA0 clock number
clk: samsung: exynos5250: Add CLK_IGNORE_UNUSED flag for the sysreg clock
Alex Elder (1):
clk: clean up everything on debugfs error
Alexandre Courbot (1):
clk: tegra: add FUSE clock device
Andrew Bresticker (8):
clk: exynos5250: fix sysmmu_mfc{l,r} gate clocks
clk: exynos5250: register APLL rate table
clk: exynos-audss: convert to platform device
clk: exynos-audss: allow input clocks to be specified in device tree
clk: exynos5250: add clock ID for div_pcm0
ARM: dts: exynos5250: add input clocks to audss clock controller
clk: exynos-audss: add support for Exynos 5420
ARM: dts: exynos5420: add input clocks to audss clock controller
Andrew Chew (1):
clk: tegra: Set the clk parent of host1x to pll_p
Andrzej Hajda (8):
ARM: exynos4: create a DT header defining CLK IDs
clk: exynos4: replace clock ID private enums with IDs from DT header
ARM: exynos5250: create a DT header defining CLK IDs
clk: exynos5250: replace clock ID private enums with IDs from DT header
ARM: exynos5420: create a DT header defining CLK IDs
clk: exynos5420: replace clock ID private enums with IDs from DT header
ARM: exynos5440: create a DT header defining CLK IDs
clk: exynos5440: replace clock ID private enums with IDs from DT header
Barry Song (1):
clk: sirf: re-arch to make the codes support both prima2 and atlas6
Boris BREZILLON (2):
clk: add clk accuracy retrieval support
clk: add accuracy support for fixed clock
Chander Kashyap (1):
clk: exynos5420: fix cpll clock register offsets
Chen-Yu Tsai (1):
clk: sunxi: Allwinner A20 output clock support
Dinh Nguyen (1):
clk: socfpga: Remove check for reg property in socfpga_clk_init
Emilio López (12):
clk: composite: .determine_rate support
clk: sunxi: factors: fix off-by-one masks
clk: sunxi: factors: clear variables before using them
clk: sunxi: protect core clocks from accidental shutdown
clk: sunxi: register factors clocks behind composite
clk: sunxi: clean the magic number of mux parents
clk: sunxi: add gating support to PLL1
clk: sunxi: make factors_clk_setup return the clock it registers
clk: sunxi: add PLL5 and PLL6 support
clk: sunxi: mod0 support
clk: sunxi: support better factor DT nodes
clk: sunxi: fix overflow when setting up divided factors
Ezequiel Garcia (2):
clk: mvebu: Add Core Divider clock
clk: fixed-factor: Fix device-tree binding typo
Grygorii Strashko (1):
clk: keystone: gate: fix error handling on init
Haojian Zhuang (3):
clk: hisilicon: add common clock support
clk: hi3620: fix wrong flags on divider
clk: hi3620: add gate clock flag
J Keerthy (4):
CLK: TI: DRA7: Add APLL support
ARM: dts: clk: Add apll related clocks
ARM: dts: DRA7: Change apll_pcie_m2_ck to fixed factor clock
ARM: dts: DRA7: Add PCIe related clock nodes
Jisheng Zhang (1):
clk: mvebu: staticize of_cpu_clk_setup
Joseph Lo (2):
clk: tegra124: add wait_for_reset and disable_clock for tegra_cpu_car_ops
clk: tegra124: add suspend/resume function for tegra_cpu_car_ops
Krzysztof Kozlowski (1):
clk: exynos: File scope reg_save array should depend on PM_SLEEP
Laurent Pinchart (3):
clk: shmobile: Add R-Car Gen2 clocks support
clk: shmobile: Add DIV6 clock support
clk: shmobile: Add MSTP clock support
Mark Zhang (3):
clk: tegra: Correct sbc mux width parent
clk: tegra: Fix vde/2d/3d clock src offset
clk: tegra: Set the clock parent of gr2d/gr3d to pll_c2
Mike Turquette (17):
Merge tag 'sunxi-clk-for-3.13' of https://github.com/mripard/linux into
clk-next-sunxi-rebase
Merge branch 'clk-tegra-next' of
git://nv-tegra.nvidia.com/user/pdeschrijver/linux into
