Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: kernel/bpf/verifier.c between commit: 7f1e33230b7c7 ("bpf: Report RCU-tasks quiescent states in do_check()") from the bpf tree and commit: 8fd58560b71e9 ("bpf: Verify static subprogs on their own") and it appears some other commit that removes the reset of current history that I didn't spot from the bpf-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc kernel/bpf/verifier.c index 9b228ffbe3fe9,1a8e5a108a681..0000000000000 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@@ -20626,13 -21560,14 +21562,16 @@@ static int do_check_block(struct bpf_ve struct bpf_insn_aux_data *insn_aux; int err; - if (signal_pending(current)) - return -EAGAIN; + if (bpf_must_abort()) + return -EINTR; + cond_resched_tasks_rcu_qs(); + - /* reset current history entry on each new instruction */ - env->cur_hist_ent = NULL; + /* no insn makes as many ids as there are from here to BPF_INHERITED_ID */ + if (env->id_gen >= BPF_MAX_ID) { + verbose(env, "too many ids\n"); + return -E2BIG; + } env->prev_insn_idx = prev_insn_idx; if (env->insn_idx >= insn_cnt) {