All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kukjin Kim <kgene.kim@samsung.com>
To: 'Tomasz Figa' <t.figa@samsung.com>, 'Olof Johansson' <olof@lixom.net>
Cc: arm@kernel.org, 'Arnd Bergmann' <arnd@arndb.de>,
	'Kevin Hilman' <khilman@linaro.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org
Subject: RE: [GIT PULL 2/5] Samsung clock updates for 3.16
Date: Thu, 22 May 2014 20:42:51 +0900	[thread overview]
Message-ID: <032801cf75b2$f62f57c0$e28e0740$@samsung.com> (raw)
In-Reply-To: <537DC9B5.6090405@samsung.com>

Tomasz Figa wrote:
> 
> Hi Olof,
> 
> On 22.05.2014 07:31, Olof Johansson wrote:
> > On Tue, May 20, 2014 at 10:11:03AM +0900, Kukjin Kim wrote:
> >> The following changes since commit
> 34c453ce16633539a94a2e876faeb731ac1be899:
> >>
> >>   ARM: S3C24XX: fix merge conflict (2014-05-15 05:54:38 +0900)
> >>
> >> are available in the git repository at:
> >>
> >>   http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-
> samsung.git
> >> tags/samsung-clk
> >>
> >> for you to fetch changes up to
6520e968eef4f88c076a84a80e026049d157132e:
> >>
> >>   clk: exynos5420: Add 5800 specific clocks (2014-05-19 22:15:08 +0900)
> >>
> >
> > 1. This is new SoC support -- you said you're sending multiplatform soon
> so
> >    we'll hold off until that's made it in.
> >
> > 2. What's the actual dependency here for taking it through arm-soc?
> Seems like
> >    nearly all of it is in drivers/clk.
> 
> This is a complicated network of dependencies:
> 
>  1) s3c24xx conversion to CCF had dependencies on Kukjin's tree so it
> was applied there,
>  2) support for multiple clock providers in Samsung clock library needed
> to convert s3c24xx clock driver (applied to Kukjin's tree) as well,
>  3) due to quite invasive nature of the series above, most of the
> patches touching Samsung clock drivers ended depending on it, due to
> multiple conflicts otherwise.
> 
Yeah it's tree, so we talked about its handling and this way would be better
to us in this time and Mike also agreed about that. Basically as you know,
we need to avoid useless merge conflicts and this is a good way it's not a
best way sometimes though :-)

Thanks,
Kukjin

WARNING: multiple messages have this Message-ID (diff)
From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/5] Samsung clock updates for 3.16
Date: Thu, 22 May 2014 20:42:51 +0900	[thread overview]
Message-ID: <032801cf75b2$f62f57c0$e28e0740$@samsung.com> (raw)
In-Reply-To: <537DC9B5.6090405@samsung.com>

Tomasz Figa wrote:
> 
> Hi Olof,
> 
> On 22.05.2014 07:31, Olof Johansson wrote:
> > On Tue, May 20, 2014 at 10:11:03AM +0900, Kukjin Kim wrote:
> >> The following changes since commit
> 34c453ce16633539a94a2e876faeb731ac1be899:
> >>
> >>   ARM: S3C24XX: fix merge conflict (2014-05-15 05:54:38 +0900)
> >>
> >> are available in the git repository at:
> >>
> >>   http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-
> samsung.git
> >> tags/samsung-clk
> >>
> >> for you to fetch changes up to
6520e968eef4f88c076a84a80e026049d157132e:
> >>
> >>   clk: exynos5420: Add 5800 specific clocks (2014-05-19 22:15:08 +0900)
> >>
> >
> > 1. This is new SoC support -- you said you're sending multiplatform soon
> so
> >    we'll hold off until that's made it in.
> >
> > 2. What's the actual dependency here for taking it through arm-soc?
> Seems like
> >    nearly all of it is in drivers/clk.
> 
> This is a complicated network of dependencies:
> 
>  1) s3c24xx conversion to CCF had dependencies on Kukjin's tree so it
> was applied there,
>  2) support for multiple clock providers in Samsung clock library needed
> to convert s3c24xx clock driver (applied to Kukjin's tree) as well,
>  3) due to quite invasive nature of the series above, most of the
> patches touching Samsung clock drivers ended depending on it, due to
> multiple conflicts otherwise.
> 
Yeah it's tree, so we talked about its handling and this way would be better
to us in this time and Mike also agreed about that. Basically as you know,
we need to avoid useless merge conflicts and this is a good way it's not a
best way sometimes though :-)

Thanks,
Kukjin

  reply	other threads:[~2014-05-22 11:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-20  1:11 [GIT PULL 2/5] Samsung clock updates for 3.16 Kukjin Kim
2014-05-20  1:11 ` Kukjin Kim
2014-05-22  5:31 ` Olof Johansson
2014-05-22  5:31   ` Olof Johansson
2014-05-22  9:56   ` Tomasz Figa
2014-05-22  9:56     ` Tomasz Figa
2014-05-22 11:42     ` Kukjin Kim [this message]
2014-05-22 11:42       ` Kukjin Kim
2014-05-29 18:17 ` Olof Johansson
2014-05-29 18:17   ` Olof Johansson
2014-05-30  1:18   ` Kukjin Kim
2014-05-30  1:18     ` 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='032801cf75b2$f62f57c0$e28e0740$@samsung.com' \
    --to=kgene.kim@samsung.com \
    --cc=arm@kernel.org \
    --cc=arnd@arndb.de \
    --cc=khilman@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=t.figa@samsung.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.