Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752591Ab3G2IFd (ORCPT ); Mon, 29 Jul 2013 04:05:33 -0400 Received: from mail-oa0-f43.google.com ([209.85.219.43]:38841 "EHLO mail-oa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752044Ab3G2IFb (ORCPT ); Mon, 29 Jul 2013 04:05:31 -0400 MIME-Version: 1.0 In-Reply-To: <003e01ce8c31$41d0c450$c5724cf0$@samsung.com> References: <003c01ce89f3$3abc4bc0$b034e340$@samsung.com> <003e01ce8c31$41d0c450$c5724cf0$@samsung.com> Date: Mon, 29 Jul 2013 13:35:28 +0530 Message-ID: Subject: Re: [PATCH v8 06/12] ARM: dts: Add description of System MMU of Exynos SoCs From: Sachin Kamat To: Cho KyongHo Cc: Linux ARM Kernel , Linux IOMMU , Linux Kernel , Linux Samsung SOC , Hyunwoong Kim , Joerg Roedel , Kukjin Kim , Prathyush , Rahul Sharma , Subash Patel , Keyyoung Park , Grant Grundler , Antonios Motakis , kvmarm@lists.cs.columbia.edu Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2596 Lines: 60 On 29 July 2013 13:27, Cho KyongHo wrote: >> -----Original Message----- >> From: Cho KyongHo [mailto:pullip.cho@samsung.com] >> Sent: Monday, July 29, 2013 4:20 PM >> >> > -----Original Message----- >> > From: Sachin Kamat [mailto:sachin.kamat@linaro.org] >> > Sent: Monday, July 29, 2013 3:38 PM >> > >> > Hi KyongHo, >> > >> > On 26 July 2013 16:58, Cho KyongHo wrote: >> > > Signed-off-by: Cho KyongHo >> > > --- >> > > .../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 /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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/