• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf · 4bfc4714
    David S. Miller authored
    Daniel Borkmann says:
    
    ====================
    pull-request: bpf 2020-12-28
    
    The following pull-request contains BPF updates for your *net* tree.
    
    There is a small merge conflict between bpf tree commit 69ca310f
    ("bpf: Save correct stopping point in file seq iteration") and net tree
    commit 66ed5944 ("bpf/task_iter: In task_file_seq_get_next use
    task_lookup_next_fd_rcu"). The get_files_struct() does not exist anymore
    in net, so take the hunk in HEAD and add the `info->tid = curr_tid` to
    the error path:
    
      [...]
                    curr_task = task_seq_get_next(ns, &curr_tid, true);
                    if (!curr_task) {
                            info->task = NULL;
                            info->tid = curr_tid;
                            return NULL;
                    }
    
                    /* set info->task and info->tid */
      [...]
    
    We've added 10 non-merge commits during the last 9 day(s) which contain
    a total of 11 files changed, 75 insertions(+), 20 deletions(...
    4bfc4714
task_iter.c 7.75 KB