Commit d1b89fc5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3323ddce ("Merge tag 'v6.4/kernel.user_worker' of...

Merge 3323ddce ("Merge tag 'v6.4/kernel.user_worker' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux"

) into android-mainline

Steps on the way to 6.4-rc1

Resolves merge conflicts with:
	kernel/fork.c

Change-Id: I7eee63052a99b7c9a9869b5626b55018a7736006
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 862d3658 3323ddce
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment