Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Browse source

Move the bpf verifier trace check into the new switch statement in
HEAD.

Resolve the overlapping changes in hinic, where bug fixes overlap
the addition of VF support.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2020-05-15 13:48:59 -07:00

parent 93d43e5868 f85c1598dd

commit da07f52d3c

342 changed files with 3458 additions and 1523 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

kernel/bpf/arraymap.c

View file

4

kernel/bpf/syscall.c

View file

20

kernel/bpf/verifier.c

View file

13

kernel/fork.c

View file

4

kernel/kcov.c

View file

1

kernel/trace/Kconfig

View file

100

kernel/trace/bpf_trace.c

View file

22

kernel/trace/ftrace_internal.h

View file

38

kernel/trace/preemptirq_delay_test.c

View file

34

kernel/trace/ring_buffer.c

View file

16

kernel/trace/trace.c

View file

24

kernel/trace/trace_boot.c

View file

8

kernel/trace/trace_kprobe.c

View file

11

kernel/umh.c

View file