Re: linux-next: manual merge of the userns tree with the bpf-next tree

Hi all, On Thu, 26 Nov 2020 16:22:48 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the userns tree got a conflict in: > > kernel/bpf/task_iter.c > > between commit: > > 91b2db27d3ff ("bpf: Simplify task_file_seq_get_next()") > > from the bpf-next tree and commit: > > e

Re: linux-next: manual merge of the userns tree with the bpf-next tree

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the userns tree got a conflict in: > > kernel/bpf/task_iter.c > > between commit: > > 91b2db27d3ff ("bpf: Simplify task_file_seq_get_next()") > > from the bpf-next tree and commit: > > edc52f17257a ("bpf/task_iter: In task_f

linux-next: manual merge of the userns tree with the bpf-next tree

Hi all, Today's linux-next merge of the userns tree got a conflict in: kernel/bpf/task_iter.c between commit: 91b2db27d3ff ("bpf: Simplify task_file_seq_get_next()") from the bpf-next tree and commit: edc52f17257a ("bpf/task_iter: In task_file_seq_get_next use task_lookup_next_fd_rcu")