arch · 0da6edbd3a379433814c738e932474057537107c · Kirill Smelkov / linux

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

David S. Miller authored 7 years ago


Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: David S. Miller <davem@davemloft.net>

51e18a45

Name	Last commit	Last update
..
alpha	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
arc	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	7 years ago
arm64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	7 years ago
blackfin	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
c6x	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
cris	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
frv	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
h8300	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
hexagon	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
ia64	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
m32r	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
m68k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	7 years ago
metag	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
microblaze	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	7 years ago
mn10300	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
nios2	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
openrisc	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
parisc	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	7 years ago
riscv	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	7 years ago
score	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
sh	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	7 years ago
sparc
tile
um
unicore32
x86
xtensa
.gitignore
Kconfig

Download source code

Download this directory