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

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 net/dccp/ackvec.h      |    9 ---------
 net/dccp/ccids/ccid3.c |    3 ---
 net/xfrm/xfrm_policy.c |    8 --------
 net/xfrm/xfrm_state.c  |    8 --------
 4 files changed, 28 deletions(-)

diff -puN net/dccp/ackvec.h~git-net-fixup net/dccp/ackvec.h
--- a/net/dccp/ackvec.h~git-net-fixup
+++ a/net/dccp/ackvec.h
@@ -66,21 +66,12 @@ struct dccp_ackvec {
  *
  * The list is sorted by avr_ack_seqno
  *
-<<<<<<< HEAD:net/dccp/ackvec.h
- * @dccpavr_node - node in dccpav_records
- * @dccpavr_ack_seqno - sequence number of the packet this record was sent on
- * @dccpavr_ack_ackno - sequence number being acknowledged
- * @dccpavr_ack_ptr - pointer into dccpav_buf where this record starts
- * @dccpavr_ack_nonce - dccpav_ack_nonce at the time this record was sent
- * @dccpavr_sent_len - length of the record in dccpav_buf
-=======
  * @avr_node - node in av_records
  * @avr_ack_seqno - sequence number of the packet this record was sent on
  * @avr_ack_ackno - sequence number being acknowledged
  * @avr_ack_ptr - pointer into av_buf where this record starts
  * @avr_ack_nonce - av_ack_nonce at the time this record was sent
  * @avr_sent_len - lenght of the record in av_buf
->>>>>>> FETCH_HEAD:net/dccp/ackvec.h
  */
 struct dccp_ackvec_record {
 	struct list_head avr_node;
diff -puN net/dccp/ccids/ccid3.c~git-net-fixup net/dccp/ccids/ccid3.c
--- a/net/dccp/ccids/ccid3.c~git-net-fixup
+++ a/net/dccp/ccids/ccid3.c
@@ -244,7 +244,6 @@ static void ccid3_hc_tx_no_feedback_time
 		hctx->ccid3hctx_x = max(hctx->ccid3hctx_x / 2,
 					(((__u64)hctx->ccid3hctx_s) << 6) /
 								    TFRC_T_MBI);
-<<<<<<< HEAD:net/dccp/ccids/ccid3.c
 
 		ccid3_pr_debug("%s(%p, state=%s), updated tx rate to %u "
 			       "bytes/s\n", dccp_role(sk), sk,
@@ -253,8 +252,6 @@ static void ccid3_hc_tx_no_feedback_time
 		/* The value of R is still undefined and so we can not recompute
 		 * the timeout value. Keep initial value as per [RFC 4342, 5]. */
 		t_nfb = TFRC_INITIAL_TIMEOUT;
-=======
->>>>>>> FETCH_HEAD:net/dccp/ccids/ccid3.c
 		ccid3_update_send_interval(hctx);
 	} else {
 		/*
diff -puN net/xfrm/xfrm_policy.c~git-net-fixup net/xfrm/xfrm_policy.c
--- a/net/xfrm/xfrm_policy.c~git-net-fixup
+++ a/net/xfrm/xfrm_policy.c
@@ -2407,13 +2407,9 @@ void xfrm_audit_policy_add(struct xfrm_p
 {
 	struct audit_buffer *audit_buf;
 
-<<<<<<< HEAD:net/xfrm/xfrm_policy.c
 	if (audit_enabled == 0)
 		return;
-	audit_buf = xfrm_audit_start(auid, sid);
-=======
 	audit_buf = xfrm_audit_start("SPD-add");
->>>>>>> FETCH_HEAD:net/xfrm/xfrm_policy.c
 	if (audit_buf == NULL)
 		return;
 	xfrm_audit_helper_usrinfo(auid, secid, audit_buf);
@@ -2428,13 +2424,9 @@ void xfrm_audit_policy_delete(struct xfr
 {
 	struct audit_buffer *audit_buf;
 
-<<<<<<< HEAD:net/xfrm/xfrm_policy.c
 	if (audit_enabled == 0)
 		return;
-	audit_buf = xfrm_audit_start(auid, sid);
-=======
 	audit_buf = xfrm_audit_start("SPD-delete");
->>>>>>> FETCH_HEAD:net/xfrm/xfrm_policy.c
 	if (audit_buf == NULL)
 		return;
 	xfrm_audit_helper_usrinfo(auid, secid, audit_buf);
diff -puN net/xfrm/xfrm_state.c~git-net-fixup net/xfrm/xfrm_state.c
--- a/net/xfrm/xfrm_state.c~git-net-fixup
+++ a/net/xfrm/xfrm_state.c
@@ -2070,9 +2070,6 @@ void xfrm_audit_state_add(struct xfrm_st
 	audit_buf = xfrm_audit_start("SAD-add");
 	if (audit_buf == NULL)
 		return;
-<<<<<<< HEAD:net/xfrm/xfrm_state.c
-	audit_buf = xfrm_audit_start(auid, sid);
-=======
 	xfrm_audit_helper_usrinfo(auid, secid, audit_buf);
 	xfrm_audit_helper_sainfo(x, audit_buf);
 	audit_log_format(audit_buf, " res=%u", result);
@@ -2086,7 +2083,6 @@ void xfrm_audit_state_delete(struct xfrm
 	struct audit_buffer *audit_buf;
 
 	audit_buf = xfrm_audit_start("SAD-delete");
->>>>>>> FETCH_HEAD:net/xfrm/xfrm_state.c
 	if (audit_buf == NULL)
 		return;
 	xfrm_audit_helper_usrinfo(auid, secid, audit_buf);
@@ -2120,13 +2116,9 @@ static void xfrm_audit_state_replay(stru
 	struct audit_buffer *audit_buf;
 	u32 spi;
 
-<<<<<<< HEAD:net/xfrm/xfrm_state.c
 	if (audit_enabled == 0)
 		return;
-	audit_buf = xfrm_audit_start(auid, sid);
-=======
 	audit_buf = xfrm_audit_start("SA-replayed-pkt");
->>>>>>> FETCH_HEAD:net/xfrm/xfrm_state.c
 	if (audit_buf == NULL)
 		return;
 	xfrm_audit_helper_pktinfo(skb, x->props.family, audit_buf);
_