Kukjin Kim wrote:

'Joerg Roedel' wrote:

quoted

On Mon, Dec 31, 2012 at 10:18:46AM -0800, Kukjin Kim wrote:

quoted

Cho KyongHo wrote:

quoted

quoted

Diffstats:
 arch/arm/boot/dts/exynos5250-smdk5250.dts  |    2 +-
 arch/arm/boot/dts/exynos5250.dtsi          |   27 +-
 arch/arm/mach-exynos/Kconfig               |    5 -
 arch/arm/mach-exynos/Makefile              |    1 -
 arch/arm/mach-exynos/clock-exynos4.c       |   41 +-
 arch/arm/mach-exynos/clock-exynos4210.c    |    9 +-
 arch/arm/mach-exynos/clock-exynos4212.c    |   23 +-
 arch/arm/mach-exynos/clock-exynos5.c       |   87 +-
 arch/arm/mach-exynos/dev-sysmmu.c          |  274 ------
 arch/arm/mach-exynos/include/mach/sysmmu.h |   66 --
 arch/arm/mach-exynos/mach-exynos4-dt.c     |   34 +
 arch/arm/mach-exynos/mach-exynos5-dt.c     |   30 +
 drivers/iommu/Kconfig                      |    2 +-
 drivers/iommu/Makefile                     |    2 +-
 drivers/iommu/exynos-iommu.c               | 1477

+++++++++++++++++++++--

quoted

quoted

-----
 15 files changed, 1284 insertions(+), 796 deletions(-)

Joerg, it's time to merge this. If you don't mind, let me pick up this

whole

quoted

quoted

series into Samsung tree because this touches many Samsung stuff.

Well, looking at the diffstat the IOMMU changes are a lot larger than
the exynos ones. So I think this should go through the IOMMU tree once
the latest review comments are fixed.

If so, too many ugly merge conflicts will be happened when Linus merges

for

v3.9 because the legacy(current) exynos clock stuff is going away in

Samsung

tree and as I said, this touches Samsung stuff widely. Of course, Stephen
should complain the conflicts between your tree and mine once you apply
this whole series in your -next before Linus' merge for v3.9. I believe,

you

don't want it.

You know, we have several options to avoid it. When you take this series

in

your tree, you can provide topic branch for me. Or this series should be
separated for arch/arm/ and drivers/ for both trees, then only
drivers/iommu changes should be picked up in your tree. I'm OK both, let

me

know which one you would prefer or other way.

Hmm, I think, just one [7/12] patch does matter so if you could create topic
branch and apply [7/12] patch firstly before other drivers/ changes would be
better to me. It's OK on both trees if I just _merge_ the first [7/12]
commit in the topic branch you provided for exynos-iommu. But you know, you
don't have to rebase it once I merge it in Samsung tree.

How about?

BTW, KyongHo, you need to update the clock changes for exynos-iommu
against on exynos common clock stuff.

KyoungHo, your changes don't matter on exynos common clock stuff and I can
take care in my tree. So no need more work for it in your side. If any
updates, let you know.

Thanks.

- Kukjin