On 29 July 2013 13:27, Cho KyongHo <pullip.cho@xxxxxxxxxxx> wrote: >> -----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? > I get the following error when I do git am on this patch (linus' tree 3.11-rc3). Other patches apply fine. Applying: ARM: dts: Add description of System MMU of Exynos SoCs <local_path>/linux/.git/rebase-apply/patch:120: new blank line at EOF. + error: patch failed: arch/arm/boot/dts/exynos4.dtsi:161 error: arch/arm/boot/dts/exynos4.dtsi: patch does not apply error: patch failed: arch/arm/boot/dts/exynos4210.dtsi:119 error: arch/arm/boot/dts/exynos4210.dtsi: patch does not apply error: patch failed: arch/arm/boot/dts/exynos4x12.dtsi:79 error: arch/arm/boot/dts/exynos4x12.dtsi: patch does not apply error: patch failed: arch/arm/boot/dts/exynos5250.dtsi:614 error: arch/arm/boot/dts/exynos5250.dtsi: patch does not apply Patch failed at 0001 ARM: dts: Add description of System MMU of Exynos SoCs When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
 |