From: schwab@linux-m68k.org (Andreas Schwab)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm/xen: fix wrong conflict resolution of xen merge
Date: Tue, 12 Aug 2014 19:20:22 +0200 [thread overview]
Message-ID: <87fvh1vd49.fsf@igel.home> (raw)
Remove duplicate definition of arch_gnttab_init.
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
---
arch/arm/xen/grant-table.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c
index 2c4041c..e437918 100644
--- a/arch/arm/xen/grant-table.c
+++ b/arch/arm/xen/grant-table.c
@@ -49,8 +49,3 @@ int arch_gnttab_init(unsigned long nr_shared)
{
return 0;
}
-
-int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status)
-{
- return 0;
-}
--
2.0.4
--
Andreas Schwab, schwab at linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
WARNING: multiple messages have this Message-ID (diff)
From: Andreas Schwab <schwab@linux-m68k.org>
To: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, xen-devel@lists.xenproject.org
Subject: [PATCH] arm/xen: fix wrong conflict resolution of xen merge
Date: Tue, 12 Aug 2014 19:20:22 +0200 [thread overview]
Message-ID: <87fvh1vd49.fsf@igel.home> (raw)
Remove duplicate definition of arch_gnttab_init.
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
---
arch/arm/xen/grant-table.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c
index 2c4041c..e437918 100644
--- a/arch/arm/xen/grant-table.c
+++ b/arch/arm/xen/grant-table.c
@@ -49,8 +49,3 @@ int arch_gnttab_init(unsigned long nr_shared)
{
return 0;
}
-
-int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status)
-{
- return 0;
-}
--
2.0.4
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next reply other threads:[~2014-08-12 17:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-12 17:20 Andreas Schwab [this message]
2014-08-12 17:20 ` [PATCH] arm/xen: fix wrong conflict resolution of xen merge Andreas Schwab
2014-08-12 17:48 ` Stefano Stabellini
2014-08-12 17:48 ` Stefano Stabellini
2014-08-12 17:48 ` Stefano Stabellini
-- strict thread matches above, loose matches on Subject: below --
2014-08-12 17:20 Andreas Schwab
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=87fvh1vd49.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.