Re: [PATCH] arm/xen: fix wrong conflict resolution of xen merge

On Tue, 12 Aug 2014, Andreas Schwab wrote: > Remove duplicate definition of arch_gnttab_init. > > Signed-off-by: Andreas Schwab 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 --gi

[PATCH] arm/xen: fix wrong conflict resolution of xen merge

Remove duplicate definition of arch_gnttab_init. Signed-off-by: Andreas Schwab --- 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/