[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20170131050759.GC16560@localhost>
Date: Mon, 30 Jan 2017 21:07:59 -0800
From: Olof Johansson <olof@...om.net>
To: Krzysztof Kozlowski <krzk@...nel.org>
Cc: Arnd Bergmann <arnd@...db.de>, Kevin Hilman <khilman@...nel.org>,
arm@...nel.org, Kukjin Kim <kgene@...nel.org>,
linux-arm-kernel@...ts.infradead.org,
linux-samsung-soc@...r.kernel.org, linux-kernel@...r.kernel.org,
Javier Martinez Canillas <javier@....samsung.com>,
Marek Szyprowski <m.szyprowski@...sung.com>,
Sylwester Nawrocki <s.nawrocki@...sung.com>,
Linus Walleij <linus.walleij@...aro.org>,
Tomasz Figa <tomasz.figa@...il.com>,
Lee Jones <lee.jones@...aro.org>
Subject: Re: [GIT PULL 4/4] arm64: dts: exynos: for v4.11, 2nd round
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@...sung.com>
> > > Cc: Sylwester Nawrocki <s.nawrocki@...sung.com>
> > > Cc: Linus Walleij <linus.walleij@...aro.org>
> > > Cc: Tomasz Figa <tomasz.figa@...il.com>
> > > Cc: Lee Jones <lee.jones@...aro.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
Powered by blists - more mailing lists