linux/tools/include/uapi
Greg Kroah-Hartman 56fd35073d Merge d2775984d0 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf") into android-mainline
Steps on the way to 5.10-rc1

Resolves conflicts in:
	drivers/net/virtio_net.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I72bb00e45bb7b6154b56f31a2e9040c4e8fe899a
2020-10-26 10:26:59 +01:00
..
asm tools: Fix off-by 1 relative directory includes 2020-03-06 08:36:46 -03:00
asm-generic Merge 22230cd2c5 ("Merge branch 'compat.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline 2020-10-23 10:23:55 +02:00
drm tools headers UAPI: Sync drm/i915_drm.h with the kernel sources 2020-08-07 09:00:03 -03:00
linux bpf: Fix bpf_redirect_neigh helper api to support supplying nexthop 2020-10-22 01:28:54 +02:00
sound tools include UAPI: Sync sound/asound.h copy 2020-02-12 11:04:23 -03:00