Greg Kroah-Hartman 9d91f3a9c7 Merge 6b7b0c3091 ("Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next") into android-mainline ... Steps on the way to 5.16-rc1. Resolves merge conflicts in: drivers/net/ethernet/intel/ice/ice_devlink.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I188502a1e6b84b61582bf3f5539785f8f2e7864f		2021-11-08 18:57:55 +01:00
..
asm	ia64: tools: remove inclusion of ia64-specific version of errno.h header	2021-04-16 16:10:37 -07:00
asm-generic	tools headers UAPI: Sync files changed by new process_mrelease syscall and the removal of some compat entry points	2021-09-10 11:45:07 -03:00
drm	tools headers UAPI: Update tools's copy of drm.h headers	2021-09-11 16:24:10 -03:00
linux	Merge 6b7b0c3091 ("Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next") into android-mainline	2021-11-08 18:57:55 +01:00
sound	tools include UAPI: Sync sound/asound.h copy with the kernel sources	2021-10-05 14:51:33 -03:00