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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <87fvh1vd49.fsf@igel.home>
Date:	Tue, 12 Aug 2014 19:20:22 +0200
From:	Andreas Schwab <schwab@...ux-m68k.org>
To:	linux-kernel@...r.kernel.org
CC:	linux-arm-kernel@...ts.infradead.org,
	xen-devel@...ts.xenproject.org
Subject: [PATCH] arm/xen: fix wrong conflict resolution of xen merge

Remove duplicate definition of arch_gnttab_init.

Signed-off-by: Andreas Schwab <schwab@...ux-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@...ux-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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/