From: Olof Johansson <olof@lixom.net>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-samsung-soc@vger.kernel.org"
<linux-samsung-soc@vger.kernel.org>
Subject: Re: [GIT PULL 4/4] Samsung devel-dma for v3.4
Date: Sat, 10 Mar 2012 10:21:49 -0800 [thread overview]
Message-ID: <20120310182149.GA656@quad.lixom.net> (raw)
In-Reply-To: <4F5B7CA7.2010604@samsung.com>
On Sat, Mar 10, 2012 at 08:09:11AM -0800, Kukjin Kim wrote:
> Hi Arnd, Olof,
>
> This is for Samsung dma stuff for v3.4 and depends on following:
> next/cleanup-use-static
> next/cleanup-exynos-clock
>
> Please pull from:
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> next/devel-samsung-dma
>
> And conflicts will be happened in clock part. Here is my preferred
> resolution. The mach-exynos/clock.c can be removed with following:
>
> arch/arm/mach-exynos/exynos-clock4.c
Hi,
given my feedback on the cleanup-exynos-clock pull request, I'm holding off on
this one waiting on you to do the resolution of the conflicts. :-)
Thanks,
-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] Samsung devel-dma for v3.4
Date: Sat, 10 Mar 2012 10:21:49 -0800 [thread overview]
Message-ID: <20120310182149.GA656@quad.lixom.net> (raw)
In-Reply-To: <4F5B7CA7.2010604@samsung.com>
On Sat, Mar 10, 2012 at 08:09:11AM -0800, Kukjin Kim wrote:
> Hi Arnd, Olof,
>
> This is for Samsung dma stuff for v3.4 and depends on following:
> next/cleanup-use-static
> next/cleanup-exynos-clock
>
> Please pull from:
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> next/devel-samsung-dma
>
> And conflicts will be happened in clock part. Here is my preferred
> resolution. The mach-exynos/clock.c can be removed with following:
>
> arch/arm/mach-exynos/exynos-clock4.c
Hi,
given my feedback on the cleanup-exynos-clock pull request, I'm holding off on
this one waiting on you to do the resolution of the conflicts. :-)
Thanks,
-Olof
next prev parent reply other threads:[~2012-03-10 18:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-10 16:09 [GIT PULL 4/4] Samsung devel-dma for v3.4 Kukjin Kim
2012-03-10 16:09 ` Kukjin Kim
2012-03-10 18:21 ` Olof Johansson [this message]
2012-03-10 18:21 ` Olof Johansson
2012-03-11 8:09 ` Kukjin Kim
2012-03-11 8:09 ` Kukjin Kim
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=20120310182149.GA656@quad.lixom.net \
--to=olof@lixom.net \
--cc=arnd@arndb.de \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
/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.