* [PATCH] arm/xen: fix wrong conflict resolution of xen merge
@ 2014-08-12 17:20 Andreas Schwab
2014-08-12 17:48 ` Stefano Stabellini
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Schwab @ 2014-08-12 17:20 UTC (permalink / raw)
To: linux-arm-kernel
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."
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] arm/xen: fix wrong conflict resolution of xen merge
2014-08-12 17:20 [PATCH] arm/xen: fix wrong conflict resolution of xen merge Andreas Schwab
@ 2014-08-12 17:48 ` Stefano Stabellini
0 siblings, 0 replies; 2+ messages in thread
From: Stefano Stabellini @ 2014-08-12 17:48 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 12 Aug 2014, Andreas Schwab wrote:
> Remove duplicate definition of arch_gnttab_init.
>
> Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Thanks for the patch, however David Vrabel already committed a fix for
this.
> 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."
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-12 17:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-12 17:20 [PATCH] arm/xen: fix wrong conflict resolution of xen merge Andreas Schwab
2014-08-12 17:48 ` Stefano Stabellini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox