diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-10 04:09:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-10 04:09:55 +0100 |
| commit | 51e18a453f5f59a40c721d4aeab082b4e2e9fac6 (patch) | |
| tree | 540d37e6f7a83466677ab6095fcdd2d6f72583c4 /arch/hexagon/include/uapi | |
| parent | macvlan: fix memory hole in macvlan_dev (diff) | |
| parent | kmemcheck: rip it out for real (diff) | |
| download | linux-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.xz linux-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.zip | |
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>
Diffstat (limited to 'arch/hexagon/include/uapi')
| -rw-r--r-- | arch/hexagon/include/uapi/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index cb5df3aad3a8..41a176dbb53e 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -2,6 +2,7 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += auxvec.h +generic-y += bpf_perf_event.h generic-y += errno.h generic-y += fcntl.h generic-y += ioctl.h |