arm/xen: fix wrong conflict resolution of xen merge
Subsystems (2)
PATCH 1/1 arm/xen: fix wrong conflict resolution of xen merge
Remove duplicate definition of arch_gnttab_init.
Signed-off-by Andreas Schwab <[email protected]>
--- arch/arm/xen/grant-table.c | 5 ----- 1 file changed, 5 deletions(-)
arch/arm/xen/grant-table.c +0 -5
@@ -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 ; -}
Signature · 7 lines
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."
Quoted 3 lines · Andreas Schwab
Remove duplicate definition of
arch_gnttab_init.Signed-off-by Andreas Schwab <[email protected]>
Thanks for the patch, however David Vrabel already committed a fix for this.
Quoted 30 lines
arch/arm/xen/grant-table.c | 5 ----- 1 file changed, 5 deletions(-)arch/arm/xen/grant-table.c +0
-5@@ -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 ; -}Signature · 12 lines
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/
Quoted 3 lines · Andreas Schwab
Remove duplicate definition of
arch_gnttab_init.Signed-off-by Andreas Schwab <[email protected]>
Thanks for the patch, however David Vrabel already committed a fix for this.
Quoted 30 lines
arch/arm/xen/grant-table.c | 5 ----- 1 file changed, 5 deletions(-)arch/arm/xen/grant-table.c +0
-5@@ -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 ; -}Signature · 12 lines
2.0.4 -- Andreas Schwab, [email protected] 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/