Merge 6ad4bf6e ("Merge tag 'io_uring-5.10-2020-10-12' of...

Merge 6ad4bf6e ("Merge tag 'io_uring-5.10-2020-10-12' of git://git.kernel.dk/linux-block"

) into android-mainline

Resolves conflict with:
	kernel/fork.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6c031ef388bfddfe80a64929d62969718755f740