From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the moduleh tree with the tree
Date: Wed, 26 Oct 2011 15:57:42 -0400 [thread overview]
Message-ID: <4EA86636.9010009@windriver.com> (raw)
In-Reply-To: <20111025194519.de13df739f60f9d961425558@canb.auug.org.au>
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 <paul.gortmaker@windriver.com>
Date: Thu Oct 13 22:25:20 2011 -0400
drop dev-tv chunk from arm fixup patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
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 <paul.gortmaker@windriver.com>
-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 <linux/dma-mapping.h>
-+#include <linux/export.h>
-
- #include <mach/irqs.h>
- #include <mach/map.h>
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
next prev parent reply other threads:[~2011-10-26 19:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 8:45 linux-next: manual merge of the moduleh tree with the tree Stephen Rothwell
2011-10-26 19:57 ` Paul Gortmaker [this message]
2011-10-26 20:48 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-10-13 6:31 Stephen Rothwell
2011-10-04 6:57 Stephen Rothwell
2011-10-04 15:22 ` Jonathan Cameron
2011-10-05 4:18 ` Paul Gortmaker
2011-09-28 6:53 Stephen Rothwell
2011-08-01 3:09 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EA86636.9010009@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).