From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Gortmaker Subject: Re: linux-next: manual merge of the moduleh tree with the tree Date: Wed, 26 Oct 2011 15:57:42 -0400 Message-ID: <4EA86636.9010009@windriver.com> References: <20111025194519.de13df739f60f9d961425558@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.windriver.com ([147.11.1.11]:46695 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752100Ab1JZT5s (ORCPT ); Wed, 26 Oct 2011 15:57:48 -0400 In-Reply-To: <20111025194519.de13df739f60f9d961425558@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On 11-10-25 04:45 AM, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the moduleh tree got a conflict in > arch/arm/plat-s5p/dev-tv.c from merge fix patch > "arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch" from the > moduleh tree. > > This file has been removed, so I dropped that hunk. Hi Stephen, I'm surprised to see this, since I'd dropped this chunk based on the last linux-next build you did before leaving for vacation. You should see this commit in the merge fix repo. ~$git ls-remote git://openlinux.windriver.com/people/paulg/modsplit-post-merge edaec64f302889b6f6eaf2d206782f46768d9922 HEAD edaec64f302889b6f6eaf2d206782f46768d9922 refs/heads/master ~$ Maybe the server fell over again when you were trying to update? Thanks, Paul. --- commit edaec64f302889b6f6eaf2d206782f46768d9922 Author: Paul Gortmaker Date: Thu Oct 13 22:25:20 2011 -0400 drop dev-tv chunk from arm fixup patch Signed-off-by: Paul Gortmaker diff --git a/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch b/arm-Ad index 9e1cbbb..89e71ed 100644 --- a/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch +++ b/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch @@ -10,18 +10,6 @@ new export.h file included that provides them. Signed-off-by: Paul Gortmaker -diff --git a/arch/arm/plat-s5p/dev-tv.c b/arch/arm/plat-s5p/dev-tv.c -index 361a1b6..7c5fb88 100644 ---- a/arch/arm/plat-s5p/dev-tv.c -+++ b/arch/arm/plat-s5p/dev-tv.c -@@ -11,6 +11,7 @@ - */ - - #include -+#include - - #include - #include diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c index 6e3d9ab..93a994a 100644 --- a/arch/arm/plat-samsung/dma-ops.c