RE: [PATCH v8 06/12] ARM: dts: Add description of System MMU of ExynosSoCs

From: Cho KyongHo
Date: Mon Jul 29 2013 - 03:57:34 EST


> -----Original Message-----
> From: Cho KyongHo [mailto:pullip.cho@xxxxxxxxxxx]
> Sent: Monday, July 29, 2013 4:20 PM
>
> > -----Original Message-----
> > From: Sachin Kamat [mailto:sachin.kamat@xxxxxxxxxx]
> > Sent: Monday, July 29, 2013 3:38 PM
> >
> > Hi KyongHo,
> >
> > On 26 July 2013 16:58, Cho KyongHo <pullip.cho@xxxxxxxxxxx> wrote:
> > > Signed-off-by: Cho KyongHo <pullip.cho@xxxxxxxxxxx>
> > > ---
> > > .../bindings/iommu/samsung,exynos4210-sysmmu.txt | 103 +++++++
> > > arch/arm/boot/dts/exynos4.dtsi | 122 ++++++++
> > > arch/arm/boot/dts/exynos4210.dtsi | 25 ++
> > > arch/arm/boot/dts/exynos4x12.dtsi | 76 +++++
> > > arch/arm/boot/dts/exynos5250.dtsi | 291 ++++++++++++++++++++
> > > 5 files changed, 617 insertions(+), 0 deletions(-)
> > > create mode 100644 Documentation/devicetree/bindings/iommu/samsung,exynos4210-sysmmu.txt
> >
> > This patch does not apply on the mainline Linus' tree (3.11-rc2). Please rebase.
> >
>
> OK. I will rebase the next patches on that.

I don't get any conflict both on the latest of Linus's tree (3.11-rc3)
and for-next branch of Samsung git.
Can you show me the diff?

>
> Thank you.
>
> Cho KyongHo.
> > --
> > With warm regards,
> > Sachin

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/