From: Andrew Morton <akpm@linux-foundation.org>

Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/audit.c  |   12 ------------
 kernel/sysctl.c |    3 ---
 2 files changed, 15 deletions(-)

diff -puN kernel/audit.c~git-audit-master-fix-git-rejects kernel/audit.c
--- a/kernel/audit.c~git-audit-master-fix-git-rejects
+++ a/kernel/audit.c
@@ -301,25 +301,13 @@ static int audit_do_config_change(char *
 }
 
 static int audit_set_rate_limit(int limit, uid_t loginuid, u32 sid)
-<<<<<<< HEAD:kernel/audit.c
-=======
 {
 	return audit_do_config_change("audit_rate_limit", &audit_rate_limit,
 				      limit, loginuid, sid);
 }
 
 static int audit_set_backlog_limit(int limit, uid_t loginuid, u32 sid)
->>>>>>> FETCH_HEAD:kernel/audit.c
 {
-<<<<<<< HEAD:kernel/audit.c
-	return audit_do_config_change("audit_rate_limit", &audit_rate_limit,
-				      limit, loginuid, sid);
-}
-
-static int audit_set_backlog_limit(int limit, uid_t loginuid, u32 sid)
-{
-=======
->>>>>>> FETCH_HEAD:kernel/audit.c
 	return audit_do_config_change("audit_backlog_limit", &audit_backlog_limit,
 				      limit, loginuid, sid);
 }
diff -puN kernel/sysctl.c~git-audit-master-fix-git-rejects kernel/sysctl.c
--- a/kernel/sysctl.c~git-audit-master-fix-git-rejects
+++ a/kernel/sysctl.c
@@ -81,10 +81,7 @@ extern int percpu_pagelist_fraction;
 extern int compat_log;
 extern int maps_protect;
 extern int sysctl_stat_interval;
-<<<<<<< HEAD:kernel/sysctl.c
 extern int latencytop_enabled;
-=======
->>>>>>> FETCH_HEAD:kernel/sysctl.c
 
 /* Constants used for minimum and  maximum */
 #ifdef CONFIG_DETECT_SOFTLOCKUP
_