David S. Miller 51e18a453f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflict was two parallel additions of include files to sch_generic.c,
no biggie.

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

2017-12-09 22:09:55 -05:00

..

alpha

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

arc

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

arm

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

2017-12-09 22:09:55 -05:00

arm64

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

2017-12-08 13:32:44 -08:00

blackfin

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

c6x

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

cris

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

frv

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

h8300

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

hexagon

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

ia64

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

m32r

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

m68k

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

2017-12-08 13:32:44 -08:00

metag

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

microblaze

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

mips

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

2017-12-08 13:32:44 -08:00

mn10300

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

nios2

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

openrisc

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

parisc

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

powerpc

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

2017-12-09 22:09:55 -05:00

riscv

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

s390

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

2017-12-08 13:32:44 -08:00

score

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

sh

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

sparc

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

tile

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

um

Merge tag 'for-linus-20171120' of git://git.infradead.org/linux-mtd

2017-11-22 20:46:06 -10:00

unicore32

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

x86

kmemcheck: rip it out for real

2017-12-08 13:40:17 -08:00

xtensa

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

.gitignore

…

Kconfig

bpf: Revert bpf_overrid_function() helper changes.

2017-11-11 18:24:55 +09:00