The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 12 ---------
drivers/net/netdevsim/dev.c | 3 --
net/rxrpc/input.c | 17 --------------
tools/lib/bpf/libbpf.c | 3 --
4 files changed, 35 deletions(-)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -2067,14 +2067,6 @@ static int parse_cls_flower(struct mlx5e
inner_match_level = MLX5_MATCH_NONE;
outer_match_level = MLX5_MATCH_NONE;
-<<<<<<< HEAD
-
- err = __parse_cls_flower(priv, spec, f, filter_dev, &inner_match_level,
- &outer_match_level);
- non_tunnel_match_level = (inner_match_level == MLX5_MATCH_NONE) ?
- outer_match_level : inner_match_level;
-=======
->>>>>>> linux-next/akpm-base
err = __parse_cls_flower(priv, spec, f, filter_dev, &inner_match_level,
&outer_match_level);
@@ -2096,11 +2088,7 @@ static int parse_cls_flower(struct mlx5e
}
}
-<<<<<<< HEAD
- if (flow->flags & MLX5E_TC_FLOW_ESWITCH) {
-=======
if (is_eswitch_flow) {
->>>>>>> linux-next/akpm-base
flow->esw_attr->inner_match_level = inner_match_level;
flow->esw_attr->outer_match_level = outer_match_level;
} else {
--- a/drivers/net/netdevsim/dev.c~linux-next-git-rejects
+++ a/drivers/net/netdevsim/dev.c
@@ -663,11 +663,8 @@ nsim_dev_create(struct nsim_bus_dev *nsi
INIT_LIST_HEAD(&nsim_dev->port_list);
mutex_init(&nsim_dev->port_list_lock);
nsim_dev->fw_update_status = true;
-<<<<<<< HEAD
-=======
nsim_dev->max_macs = NSIM_DEV_MAX_MACS_DEFAULT;
nsim_dev->test1 = NSIM_DEV_TEST1_DEFAULT;
->>>>>>> linux-next/akpm-base
err = nsim_dev_resources_register(devlink);
if (err)
--- a/net/rxrpc/input.c~linux-next-git-rejects
+++ a/net/rxrpc/input.c
@@ -1028,11 +1028,7 @@ static void rxrpc_input_call_packet(stru
switch (sp->hdr.type) {
case RXRPC_PACKET_TYPE_DATA:
rxrpc_input_data(call, skb);
-<<<<<<< HEAD
- break;
-=======
goto no_free;
->>>>>>> linux-next/akpm-base
case RXRPC_PACKET_TYPE_ACK:
rxrpc_input_ack(call, skb);
@@ -1122,11 +1118,7 @@ static void rxrpc_post_packet_to_local(s
skb_queue_tail(&local->event_queue, skb);
rxrpc_queue_local(local);
} else {
-<<<<<<< HEAD
- rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
-=======
rxrpc_free_skb(skb, rxrpc_skb_freed);
->>>>>>> linux-next/akpm-base
}
}
@@ -1141,11 +1133,7 @@ static void rxrpc_reject_packet(struct r
skb_queue_tail(&local->reject_queue, skb);
rxrpc_queue_local(local);
} else {
-<<<<<<< HEAD
- rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
-=======
rxrpc_free_skb(skb, rxrpc_skb_freed);
->>>>>>> linux-next/akpm-base
}
}
@@ -1393,16 +1381,11 @@ int rxrpc_input_packet(struct sock *udp_
mutex_unlock(&call->user_mutex);
}
-<<<<<<< HEAD
- rxrpc_input_call_packet(call, skb);
- goto discard;
-=======
/* Process a call packet; this either discards or passes on the ref
* elsewhere.
*/
rxrpc_input_call_packet(call, skb);
goto out;
->>>>>>> linux-next/akpm-base
discard:
rxrpc_free_skb(skb, rxrpc_skb_freed);
--- a/tools/lib/bpf/libbpf.c~linux-next-git-rejects
+++ a/tools/lib/bpf/libbpf.c
@@ -2293,8 +2293,6 @@ bpf_program_reloc_btf_ext(struct bpf_pro
prog->line_info_rec_size = btf_ext__line_info_rec_size(obj->btf_ext);
}
-<<<<<<< HEAD
-=======
return 0;
}
@@ -3103,7 +3101,6 @@ static int bpf_core_reloc_offset(struct
return -EINVAL;
}
->>>>>>> linux-next/akpm-base
return 0;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch
mm.patch
mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes.patch
mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes-fix.patch
mm-introduce-page_shift-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch
mm-memory_hotplug-remove-move_pfn_range-fix.patch
mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix-2.patch
mm-mmapc-refine-find_vma_prev-with-rb_last-fix.patch
dev-kmem-debug-preadv-progress-fix.patch
dev-kmem-debug-preadv-progress-fix-fix.patch
diff-sucks.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
