a32: Fixup of left over conflicts

ahnet-69 · Sep 5, 2024 · 668168a · 668168a
1 parent a3c6083
commit 668168a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
@@ -3669,7 +3669,7 @@ static int restore_curseg_summaries(struct f2fs_sb_info *sbi)
 	/* sanity check for summary blocks */
 	if (nats_in_cursum(nat_j) > NAT_JOURNAL_ENTRIES ||
 			sits_in_cursum(sit_j) > SIT_JOURNAL_ENTRIES) {
-		f2fs_msg(sbi->sb, KERN_ERR,
+		f2fs_err(sbi->sb, KERN_ERR,
 			"invalid journal entries nats %u sits %u\n",
 			nats_in_cursum(nat_j), sits_in_cursum(sit_j));
 		return -EINVAL;

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
@@ -3903,24 +3903,14 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
 	/* setup f2fs internal modules */
 	err = f2fs_build_segment_manager(sbi);
 	if (err) {
-<<<<<<< HEAD
-		f2fs_err(sbi, "Failed to initialize F2FS segment manager (%d)",
-			 err);
-=======
-		f2fs_msg(sb, KERN_ERR,
-			"Failed to initialize F2FS segment manager (%d)", err);
->>>>>>> 46dc390d5714 (f2fs: add error prints for debugging mount failure)
+               f2fs_err(sbi, "Failed to initialize F2FS segment manager (%d)",
+                        err);
 		goto free_sm;
 	}
 	err = f2fs_build_node_manager(sbi);
 	if (err) {
-<<<<<<< HEAD
-		f2fs_err(sbi, "Failed to initialize F2FS node manager (%d)",
-			 err);
-=======
-		f2fs_msg(sb, KERN_ERR,
-			"Failed to initialize F2FS node manager (%d)", err);
->>>>>>> 46dc390d5714 (f2fs: add error prints for debugging mount failure)
+               f2fs_err(sbi, "Failed to initialize F2FS node manager (%d)",
+                        err);
 		goto free_nm;
 	}
 

diff --git a/net/core/filter.c b/net/core/filter.c
@@ -2210,11 +2210,6 @@ static int bpf_skb_proto_6_to_4(struct sk_buff *skb)
 			shinfo->gso_type |=  SKB_GSO_TCPV4;
 		}
 
-<<<<<<< HEAD
-=======
-		/* Due to IPv4 header, MSS can be upgraded. */
-		skb_increase_gso_size(shinfo, len_diff);
->>>>>>> 19b468b254ac (bpf: fix bpf_skb_adjust_net/bpf_skb_proto_xlat to deal with gso sctp skbs)
 		/* Header must be checked, and gso_segs recomputed. */
 		shinfo->gso_type |= SKB_GSO_DODGY;
 		shinfo->gso_segs = 0;