linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL 0/4] ARM: exynos: Second round for v4.11
@ 2017-01-29 20:06 Krzysztof Kozlowski
  2017-01-29 20:06 ` [GIT PULL 2/4] soc: samsung: exynos for v4.11, 2nd round Krzysztof Kozlowski
                   ` (3 more replies)
  0 siblings, 4 replies; 12+ messages in thread
From: Krzysztof Kozlowski @ 2017-01-29 20:06 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, Kevin Hilman, arm
  Cc: Krzysztof Kozlowski, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas

Hi,

All pull requests on top of previous ones.
No specific dependencies of pulling. No external dependencies
included.

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [GIT PULL 2/4] soc: samsung: exynos for v4.11, 2nd round
  2017-01-29 20:06 [GIT PULL 0/4] ARM: exynos: Second round for v4.11 Krzysztof Kozlowski
@ 2017-01-29 20:06 ` Krzysztof Kozlowski
  2017-01-30  5:19   ` Olof Johansson
  2017-01-29 20:06 ` [GIT PULL 3/4] ARM: dts: exynos: " Krzysztof Kozlowski
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 12+ messages in thread
From: Krzysztof Kozlowski @ 2017-01-29 20:06 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, Kevin Hilman, arm
  Cc: Krzysztof Kozlowski, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas,
	Marek Szyprowski, Sylwester Nawrocki, Linus Walleij, Tomasz Figa,
	Lee Jones

Hi,

On top of previous pull request (tags/samsung-drivers-soc-pmu-4.11).

This adds support for Exynos5433 to PMU driver which is needed
by Marek's patchset:
 - [PATCH v2 0/8] Pad retentions support for Exynos5433
   https://lkml.kernel.org/r/1485419634-28331-1-git-send-email-m.szyprowski () samsung ! com


Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Lee Jones <lee.jones@linaro.org>

Best regards,
Krzysztof


The following changes since commit 1da6de33e43901ec5220cbf292d71172635ada67:

  soc: samsung: pmu: Remove messages for failed memory allocation (2017-01-20 18:37:27 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-drivers-soc-pmu-4.11-2

for you to fetch changes up to ee55ae6194a5439bde3a3b8ee0abda63c610e740:

  soc: samsung: pmu: Remove duplicated define for ARM_L2_OPTION register (2017-01-27 11:32:31 +0200)

----------------------------------------------------------------
Continuation of improvements for Exynos PM drivers for v4.11:
1. Add support for Exynos5433 to Power Management Unit (PMU) and Power
   Domains drivers.
2. Cleanups of duplicated and unused defines.

----------------------------------------------------------------
Chanwoo Choi (1):
      soc: samsung: pm_domains: Add new Exynos5433 compatible

Krzysztof Kozlowski (2):
      soc: samsung: pmu: Remove unused and duplicated defines
      soc: samsung: pmu: Remove duplicated define for ARM_L2_OPTION register

Marek Szyprowski (1):
      soc: samsung: pmu: Add dummy support for Exynos5433 SoC

 .../devicetree/bindings/power/pd-samsung.txt       |  1 +
 arch/arm/mach-exynos/suspend.c                     |  6 +-
 drivers/soc/samsung/exynos-pmu.c                   |  6 +-
 drivers/soc/samsung/exynos5250-pmu.c               |  2 +-
 drivers/soc/samsung/exynos5420-pmu.c               |  4 +-
 drivers/soc/samsung/pm_domains.c                   |  7 ++
 include/linux/soc/samsung/exynos-regs-pmu.h        | 75 +++-------------------
 7 files changed, 26 insertions(+), 75 deletions(-)

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [GIT PULL 3/4] ARM: dts: exynos: for v4.11, 2nd round
  2017-01-29 20:06 [GIT PULL 0/4] ARM: exynos: Second round for v4.11 Krzysztof Kozlowski
  2017-01-29 20:06 ` [GIT PULL 2/4] soc: samsung: exynos for v4.11, 2nd round Krzysztof Kozlowski
@ 2017-01-29 20:06 ` Krzysztof Kozlowski
  2017-01-30  5:19   ` Olof Johansson
  2017-01-29 20:06 ` [GIT PULL 4/4] arm64: " Krzysztof Kozlowski
  2017-01-29 20:06 ` [GIT PULL 1/4] ARM: mach/soc: exynos " Krzysztof Kozlowski
  3 siblings, 1 reply; 12+ messages in thread
From: Krzysztof Kozlowski @ 2017-01-29 20:06 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, Kevin Hilman, arm
  Cc: Krzysztof Kozlowski, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas

Hi,

On top of previous pull request.

Best regards,
Krzysztof


The following changes since commit bca9085e0ae93253bc93ce218c85ac7d7e7f1831:

  ARM: dts: exynos: remove Exynos4212 support (dead code) (2017-01-11 18:28:43 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-4.11-2

for you to fetch changes up to dfaf06baad0c088a55570f7a324949c498f2106c:

  ARM: dts: exynos: Fix indentation of EHCI and OHCI ports (2017-01-29 21:03:46 +0200)

----------------------------------------------------------------
Samsung DeviceTree update for v4.11, second round:
1. Use bigger reserved memory region for Multi Format Codec on all Exynos
   chipsets so it could decode FullHD easily.

----------------------------------------------------------------
Javier Martinez Canillas (1):
      ARM: dts: exynos: Increase MFC left reserved memory region size

Krzysztof Kozlowski (1):
      ARM: dts: exynos: Fix indentation of EHCI and OHCI ports

 arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi |  2 +-
 arch/arm/boot/dts/exynos4.dtsi                    | 24 +++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [GIT PULL 4/4] arm64: dts: exynos: for v4.11, 2nd round
  2017-01-29 20:06 [GIT PULL 0/4] ARM: exynos: Second round for v4.11 Krzysztof Kozlowski
  2017-01-29 20:06 ` [GIT PULL 2/4] soc: samsung: exynos for v4.11, 2nd round Krzysztof Kozlowski
  2017-01-29 20:06 ` [GIT PULL 3/4] ARM: dts: exynos: " Krzysztof Kozlowski
@ 2017-01-29 20:06 ` Krzysztof Kozlowski
  2017-01-30  5:23   ` Olof Johansson
  2017-01-29 20:06 ` [GIT PULL 1/4] ARM: mach/soc: exynos " Krzysztof Kozlowski
  3 siblings, 1 reply; 12+ messages in thread
From: Krzysztof Kozlowski @ 2017-01-29 20:06 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, Kevin Hilman, arm
  Cc: Krzysztof Kozlowski, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas,
	Marek Szyprowski, Sylwester Nawrocki, Linus Walleij, Tomasz Figa,
	Lee Jones

Hi,

On top of previous pull request.

This adds proper clocks to LPASS node on Exynos5433 which is needed
by Marek's patchset:
 - [PATCH v2 0/8] Pad retentions support for Exynos5433
   https://lkml.kernel.org/r/1485419634-28331-1-git-send-email-m.szyprowski () samsung ! com


Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Lee Jones <lee.jones@linaro.org>

Best regards,
Krzysztof


The following changes since commit e4e381133241a27d732e78be09973b89a193eaf7:

  arm64: dts: exynos: Enable HDMI/TV path on Exynos5433-TM2 (2017-01-11 18:20:28 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt64-4.11-2

for you to fetch changes up to 7547162ac351483df3641f64e99e10be329dd6a2:

  arm64: dts: exynos: Add clocks to Exynos5433 LPASS module (2017-01-26 22:04:20 +0200)

----------------------------------------------------------------
Samsung DeviceTree ARM64 update for v4.11, second round:
1. Use proper drive strengths on Exynos7.
2. Fix significant current leak on Exynos5433-based TM2/TM2E due
   to disabled regulator.
2. Add touchkey to TM2, set display clocks for Ultra HD modes.
3. Cleanups and minor fixes for Exynos5433, TM2 and TM2E.

----------------------------------------------------------------
Andrzej Hajda (2):
      arm64: dts: exynos: configure TV path clocks for Ultra HD modes
      arm64: dts: exynos: set LDO7 regulator as always on

Jaechul Lee (1):
      arm64: dts: exynos: Add TM2 touchkey node

Javier Martinez Canillas (1):
      arm64: dts: exynos: Remove unneeded unit names in Exynos5433 nodes

Marek Szyprowski (2):
      arm64: dts: exynos: Disable pull down for audio pins in Exynos5433 SoCs
      arm64: dts: exynos: Add clocks to Exynos5433 LPASS module

Pankaj Dubey (1):
      arm64: dts: exynos: Fix drive strength of sd0_xxx pin definitions

 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi    | 10 +++++-----
 arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 16 ++++++++++++++++
 arch/arm64/boot/dts/exynos/exynos5433-tm2.dts         | 13 +++++++++++++
 arch/arm64/boot/dts/exynos/exynos5433.dtsi            |  8 +++++---
 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi       | 14 +++++++-------
 5 files changed, 46 insertions(+), 15 deletions(-)

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [GIT PULL 1/4] ARM: mach/soc: exynos for v4.11, 2nd round
  2017-01-29 20:06 [GIT PULL 0/4] ARM: exynos: Second round for v4.11 Krzysztof Kozlowski
                   ` (2 preceding siblings ...)
  2017-01-29 20:06 ` [GIT PULL 4/4] arm64: " Krzysztof Kozlowski
@ 2017-01-29 20:06 ` Krzysztof Kozlowski
  2017-01-30  5:24   ` Olof Johansson
  3 siblings, 1 reply; 12+ messages in thread
From: Krzysztof Kozlowski @ 2017-01-29 20:06 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, Kevin Hilman, arm
  Cc: Krzysztof Kozlowski, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas


On top of previous pull request.


The following changes since commit cda1a52dab50340728e46601e6c9da9fc4beaf1f:

  ARM: s3c64xx: Constify wake_irqs (2016-12-29 15:41:44 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-soc-4.11-2

for you to fetch changes up to 95ed41df129ca8f76eb190534d20f4a6dcd37213:

  dt-bindings: video: exynos7-decon: Remove obsolete samsung,power-domain property (2017-01-29 21:03:56 +0200)

----------------------------------------------------------------
Samsung mach/soc update for v4.11, second round:
1. Remove mach code for Exynos4415 as a continuation of removal
   of this SoC.
2. Remove obsolete property from the bindings documentation.

----------------------------------------------------------------
Krzysztof Kozlowski (2):
      ARM: EXYNOS: Remove Exynos4415 arch code (SoC not supported anymore)
      dt-bindings: video: exynos7-decon: Remove obsolete samsung,power-domain property

 Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt | 2 +-
 arch/arm/mach-exynos/Kconfig                                       | 5 -----
 arch/arm/mach-exynos/exynos.c                                      | 1 -
 arch/arm/mach-exynos/suspend.c                                     | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [GIT PULL 2/4] soc: samsung: exynos for v4.11, 2nd round
  2017-01-29 20:06 ` [GIT PULL 2/4] soc: samsung: exynos for v4.11, 2nd round Krzysztof Kozlowski
@ 2017-01-30  5:19   ` Olof Johansson
  0 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2017-01-30  5:19 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Arnd Bergmann, Kevin Hilman, arm, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas,
	Marek Szyprowski, Sylwester Nawrocki, Linus Walleij, Tomasz Figa,
	Lee Jones

On Sun, Jan 29, 2017 at 10:06:27PM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> On top of previous pull request (tags/samsung-drivers-soc-pmu-4.11).
> 
> This adds support for Exynos5433 to PMU driver which is needed
> by Marek's patchset:
>  - [PATCH v2 0/8] Pad retentions support for Exynos5433
>    https://lkml.kernel.org/r/1485419634-28331-1-git-send-email-m.szyprowski () samsung ! com
> 
> 
> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Tomasz Figa <tomasz.figa@gmail.com>
> Cc: Lee Jones <lee.jones@linaro.org>
> 
> Best regards,
> Krzysztof

Merged, thanks!


-Olof

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [GIT PULL 3/4] ARM: dts: exynos: for v4.11, 2nd round
  2017-01-29 20:06 ` [GIT PULL 3/4] ARM: dts: exynos: " Krzysztof Kozlowski
@ 2017-01-30  5:19   ` Olof Johansson
  0 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2017-01-30  5:19 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Arnd Bergmann, Kevin Hilman, arm, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas

On Sun, Jan 29, 2017 at 10:06:28PM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> On top of previous pull request.
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit bca9085e0ae93253bc93ce218c85ac7d7e7f1831:
> 
>   ARM: dts: exynos: remove Exynos4212 support (dead code) (2017-01-11 18:28:43 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-4.11-2
> 
> for you to fetch changes up to dfaf06baad0c088a55570f7a324949c498f2106c:
> 
>   ARM: dts: exynos: Fix indentation of EHCI and OHCI ports (2017-01-29 21:03:46 +0200)
> 
> ----------------------------------------------------------------
> Samsung DeviceTree update for v4.11, second round:
> 1. Use bigger reserved memory region for Multi Format Codec on all Exynos
>    chipsets so it could decode FullHD easily.

Merged, thanks.


-Olof

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [GIT PULL 4/4] arm64: dts: exynos: for v4.11, 2nd round
  2017-01-29 20:06 ` [GIT PULL 4/4] arm64: " Krzysztof Kozlowski
@ 2017-01-30  5:23   ` Olof Johansson
  2017-01-30  6:55     ` Krzysztof Kozlowski
  2017-01-30 17:57     ` Krzysztof Kozlowski
  0 siblings, 2 replies; 12+ messages in thread
From: Olof Johansson @ 2017-01-30  5:23 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Arnd Bergmann, Kevin Hilman, arm, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas,
	Marek Szyprowski, Sylwester Nawrocki, Linus Walleij, Tomasz Figa,
	Lee Jones

Hi Krzysztof,

On Sun, Jan 29, 2017 at 10:06:29PM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> On top of previous pull request.
> 
> This adds proper clocks to LPASS node on Exynos5433 which is needed
> by Marek's patchset:
>  - [PATCH v2 0/8] Pad retentions support for Exynos5433
>    https://lkml.kernel.org/r/1485419634-28331-1-git-send-email-m.szyprowski () samsung ! com
> 
> 
> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Tomasz Figa <tomasz.figa@gmail.com>
> Cc: Lee Jones <lee.jones@linaro.org>
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit e4e381133241a27d732e78be09973b89a193eaf7:
> 
>   arm64: dts: exynos: Enable HDMI/TV path on Exynos5433-TM2 (2017-01-11 18:20:28 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt64-4.11-2
> 
> for you to fetch changes up to 7547162ac351483df3641f64e99e10be329dd6a2:
> 
>   arm64: dts: exynos: Add clocks to Exynos5433 LPASS module (2017-01-26 22:04:20 +0200)

I think you tagged the wrong branch here. The log message shows the right hash
at the tip, but the tag is of 95648b747071d530b5bb983735cfe0ffff1b66bf, which
seems to be on your for-next.

Care to respin, so your tag and our merged branch match up?


Thanks!


-Olof

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [GIT PULL 1/4] ARM: mach/soc: exynos for v4.11, 2nd round
  2017-01-29 20:06 ` [GIT PULL 1/4] ARM: mach/soc: exynos " Krzysztof Kozlowski
@ 2017-01-30  5:24   ` Olof Johansson
  0 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2017-01-30  5:24 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Arnd Bergmann, Kevin Hilman, arm, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas

On Sun, Jan 29, 2017 at 10:06:30PM +0200, Krzysztof Kozlowski wrote:
> 
> On top of previous pull request.
> 
> 
> The following changes since commit cda1a52dab50340728e46601e6c9da9fc4beaf1f:
> 
>   ARM: s3c64xx: Constify wake_irqs (2016-12-29 15:41:44 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-soc-4.11-2
> 
> for you to fetch changes up to 95ed41df129ca8f76eb190534d20f4a6dcd37213:
> 
>   dt-bindings: video: exynos7-decon: Remove obsolete samsung,power-domain property (2017-01-29 21:03:56 +0200)
> 
> ----------------------------------------------------------------
> Samsung mach/soc update for v4.11, second round:
> 1. Remove mach code for Exynos4415 as a continuation of removal
>    of this SoC.
> 2. Remove obsolete property from the bindings documentation.

Merged, thanks!


-Olof

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [GIT PULL 4/4] arm64: dts: exynos: for v4.11, 2nd round
  2017-01-30  5:23   ` Olof Johansson
@ 2017-01-30  6:55     ` Krzysztof Kozlowski
  2017-01-30 17:57     ` Krzysztof Kozlowski
  1 sibling, 0 replies; 12+ messages in thread
From: Krzysztof Kozlowski @ 2017-01-30  6:55 UTC (permalink / raw)
  To: Olof Johansson
  Cc: Arnd Bergmann, Kevin Hilman, arm, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas,
	Marek Szyprowski, Sylwester Nawrocki, Linus Walleij, Tomasz Figa,
	Lee Jones

On Mon, Jan 30, 2017 at 7:23 AM, Olof Johansson <olof@lixom.net> wrote:
> Hi Krzysztof,
>
> On Sun, Jan 29, 2017 at 10:06:29PM +0200, Krzysztof Kozlowski wrote:
>> Hi,
>>
>> On top of previous pull request.
>>
>> This adds proper clocks to LPASS node on Exynos5433 which is needed
>> by Marek's patchset:
>>  - [PATCH v2 0/8] Pad retentions support for Exynos5433
>>    https://lkml.kernel.org/r/1485419634-28331-1-git-send-email-m.szyprowski () samsung ! com
>>
>>
>> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
>> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Cc: Tomasz Figa <tomasz.figa@gmail.com>
>> Cc: Lee Jones <lee.jones@linaro.org>
>>
>> Best regards,
>> Krzysztof
>>
>>
>> The following changes since commit e4e381133241a27d732e78be09973b89a193eaf7:
>>
>>   arm64: dts: exynos: Enable HDMI/TV path on Exynos5433-TM2 (2017-01-11 18:20:28 +0200)
>>
>> are available in the git repository at:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt64-4.11-2
>>
>> for you to fetch changes up to 7547162ac351483df3641f64e99e10be329dd6a2:
>>
>>   arm64: dts: exynos: Add clocks to Exynos5433 LPASS module (2017-01-26 22:04:20 +0200)
>
> I think you tagged the wrong branch here. The log message shows the right hash
> at the tip, but the tag is of 95648b747071d530b5bb983735cfe0ffff1b66bf, which
> seems to be on your for-next.
>
> Care to respin, so your tag and our merged branch match up?

Ahhh, damn it. I'll fix it.

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [GIT PULL 4/4] arm64: dts: exynos: for v4.11, 2nd round
  2017-01-30  5:23   ` Olof Johansson
  2017-01-30  6:55     ` Krzysztof Kozlowski
@ 2017-01-30 17:57     ` Krzysztof Kozlowski
  2017-01-31  5:07       ` Olof Johansson
  1 sibling, 1 reply; 12+ messages in thread
From: Krzysztof Kozlowski @ 2017-01-30 17:57 UTC (permalink / raw)
  To: Olof Johansson
  Cc: Arnd Bergmann, Kevin Hilman, arm, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas,
	Marek Szyprowski, Sylwester Nawrocki, Linus Walleij, Tomasz Figa,
	Lee Jones

On Sun, Jan 29, 2017 at 09:23:29PM -0800, Olof Johansson wrote:
> Hi Krzysztof,
> 
> On Sun, Jan 29, 2017 at 10:06:29PM +0200, Krzysztof Kozlowski wrote:
> > Hi,
> > 
> > On top of previous pull request.
> > 
> > This adds proper clocks to LPASS node on Exynos5433 which is needed
> > by Marek's patchset:
> >  - [PATCH v2 0/8] Pad retentions support for Exynos5433
> >    https://lkml.kernel.org/r/1485419634-28331-1-git-send-email-m.szyprowski () samsung ! com
> > 
> > 
> > Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> > Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Cc: Tomasz Figa <tomasz.figa@gmail.com>
> > Cc: Lee Jones <lee.jones@linaro.org>
> > 
> > Best regards,
> > Krzysztof
> > 
> > 
> > The following changes since commit e4e381133241a27d732e78be09973b89a193eaf7:
> > 
> >   arm64: dts: exynos: Enable HDMI/TV path on Exynos5433-TM2 (2017-01-11 18:20:28 +0200)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt64-4.11-2
> > 
> > for you to fetch changes up to 7547162ac351483df3641f64e99e10be329dd6a2:
> > 
> >   arm64: dts: exynos: Add clocks to Exynos5433 LPASS module (2017-01-26 22:04:20 +0200)
> 
> I think you tagged the wrong branch here. The log message shows the right hash
> at the tip, but the tag is of 95648b747071d530b5bb983735cfe0ffff1b66bf, which
> seems to be on your for-next.
> 
> Care to respin, so your tag and our merged branch match up?
>
Fixed, the same name of tag but this time on proper branch:
tag name	samsung-dt64-4.11-2
https://git.kernel.org/cgit/linux/kernel/git/krzk/linux.git/log/?h=next/dt64

Sorry for the mess.

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [GIT PULL 4/4] arm64: dts: exynos: for v4.11, 2nd round
  2017-01-30 17:57     ` Krzysztof Kozlowski
@ 2017-01-31  5:07       ` Olof Johansson
  0 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2017-01-31  5:07 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Arnd Bergmann, Kevin Hilman, arm, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas,
	Marek Szyprowski, Sylwester Nawrocki, Linus Walleij, Tomasz Figa,
	Lee Jones

On Mon, Jan 30, 2017 at 07:57:20PM +0200, Krzysztof Kozlowski wrote:
> On Sun, Jan 29, 2017 at 09:23:29PM -0800, Olof Johansson wrote:
> > Hi Krzysztof,
> > 
> > On Sun, Jan 29, 2017 at 10:06:29PM +0200, Krzysztof Kozlowski wrote:
> > > Hi,
> > > 
> > > On top of previous pull request.
> > > 
> > > This adds proper clocks to LPASS node on Exynos5433 which is needed
> > > by Marek's patchset:
> > >  - [PATCH v2 0/8] Pad retentions support for Exynos5433
> > >    https://lkml.kernel.org/r/1485419634-28331-1-git-send-email-m.szyprowski () samsung ! com
> > > 
> > > 
> > > Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> > > Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> > > Cc: Linus Walleij <linus.walleij@linaro.org>
> > > Cc: Tomasz Figa <tomasz.figa@gmail.com>
> > > Cc: Lee Jones <lee.jones@linaro.org>
> > > 
> > > Best regards,
> > > Krzysztof
> > > 
> > > 
> > > The following changes since commit e4e381133241a27d732e78be09973b89a193eaf7:
> > > 
> > >   arm64: dts: exynos: Enable HDMI/TV path on Exynos5433-TM2 (2017-01-11 18:20:28 +0200)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt64-4.11-2
> > > 
> > > for you to fetch changes up to 7547162ac351483df3641f64e99e10be329dd6a2:
> > > 
> > >   arm64: dts: exynos: Add clocks to Exynos5433 LPASS module (2017-01-26 22:04:20 +0200)
> > 
> > I think you tagged the wrong branch here. The log message shows the right hash
> > at the tip, but the tag is of 95648b747071d530b5bb983735cfe0ffff1b66bf, which
> > seems to be on your for-next.
> > 
> > Care to respin, so your tag and our merged branch match up?
> >
> Fixed, the same name of tag but this time on proper branch:
> tag name	samsung-dt64-4.11-2
> https://git.kernel.org/cgit/linux/kernel/git/krzk/linux.git/log/?h=next/dt64

Merged!

> Sorry for the mess.

No worries, I've done exactly that myself before.


-Olof

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2017-01-31  5:30 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-29 20:06 [GIT PULL 0/4] ARM: exynos: Second round for v4.11 Krzysztof Kozlowski
2017-01-29 20:06 ` [GIT PULL 2/4] soc: samsung: exynos for v4.11, 2nd round Krzysztof Kozlowski
2017-01-30  5:19   ` Olof Johansson
2017-01-29 20:06 ` [GIT PULL 3/4] ARM: dts: exynos: " Krzysztof Kozlowski
2017-01-30  5:19   ` Olof Johansson
2017-01-29 20:06 ` [GIT PULL 4/4] arm64: " Krzysztof Kozlowski
2017-01-30  5:23   ` Olof Johansson
2017-01-30  6:55     ` Krzysztof Kozlowski
2017-01-30 17:57     ` Krzysztof Kozlowski
2017-01-31  5:07       ` Olof Johansson
2017-01-29 20:06 ` [GIT PULL 1/4] ARM: mach/soc: exynos " Krzysztof Kozlowski
2017-01-30  5:24   ` Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).