All of lore.kernel.org
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Kevin Hilman <khilman@kernel.org>,
	arm@kernel.org, Kukjin Kim <kgene@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
	Javier Martinez Canillas <javier@osg.samsung.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Sylwester Nawrocki <s.nawrocki@samsung.com>,
	Linus Walleij <linus.walleij@linaro.org>,
	Tomasz Figa <tomasz.figa@gmail.com>,
	Lee Jones <lee.jones@linaro.org>
Subject: Re: [GIT PULL 4/4] arm64: dts: exynos: for v4.11, 2nd round
Date: Mon, 30 Jan 2017 21:07:59 -0800	[thread overview]
Message-ID: <20170131050759.GC16560@localhost> (raw)
In-Reply-To: <20170130175720.nfmhet6mkajq3vho@kozik-lap>

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

WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 4/4] arm64: dts: exynos: for v4.11, 2nd round
Date: Mon, 30 Jan 2017 21:07:59 -0800	[thread overview]
Message-ID: <20170131050759.GC16560@localhost> (raw)
In-Reply-To: <20170130175720.nfmhet6mkajq3vho@kozik-lap>

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

  reply	other threads:[~2017-01-31  5:30 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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-29 20:06 ` 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-29 20:06   ` Krzysztof Kozlowski
2017-01-30  5:19   ` Olof Johansson
2017-01-30  5:19     ` Olof Johansson
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:19   ` Olof Johansson
2017-01-30  5:19     ` Olof Johansson
2017-01-29 20:06 ` [GIT PULL 4/4] arm64: " Krzysztof Kozlowski
2017-01-29 20:06   ` Krzysztof Kozlowski
2017-01-30  5:23   ` Olof Johansson
2017-01-30  5:23     ` Olof Johansson
2017-01-30  6:55     ` Krzysztof Kozlowski
2017-01-30  6:55       ` Krzysztof Kozlowski
2017-01-30 17:57     ` Krzysztof Kozlowski
2017-01-30 17:57       ` Krzysztof Kozlowski
2017-01-30 17:57       ` Krzysztof Kozlowski
2017-01-31  5:07       ` Olof Johansson [this message]
2017-01-31  5:07         ` Olof Johansson
2017-01-29 20:06 ` [GIT PULL 1/4] ARM: mach/soc: exynos " Krzysztof Kozlowski
2017-01-29 20:06   ` Krzysztof Kozlowski
2017-01-30  5:24   ` Olof Johansson
2017-01-30  5:24     ` Olof Johansson

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=20170131050759.GC16560@localhost \
    --to=olof@lixom.net \
    --cc=arm@kernel.org \
    --cc=arnd@arndb.de \
    --cc=javier@osg.samsung.com \
    --cc=kgene@kernel.org \
    --cc=khilman@kernel.org \
    --cc=krzk@kernel.org \
    --cc=lee.jones@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=s.nawrocki@samsung.com \
    --cc=tomasz.figa@gmail.com \
    /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.