linux-uconsole/tools/include/uapi
Greg Kroah-Hartman 5a8acc99f7 Merge 9ff9b0d392 ("Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline
Steps on the way to 5.10-rc1

Resolves merge issues in:
	drivers/net/virtio_net.c
	net/xfrm/xfrm_state.c
	net/xfrm/xfrm_user.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3132e7802f25cb775eb02d0b3a03068da39a6fe2
2020-10-26 09:20:21 +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: Allow for map-in-map with dynamic inner array map entries 2020-10-11 10:21:04 -07:00
sound tools include UAPI: Sync sound/asound.h copy 2020-02-12 11:04:23 -03:00