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

Merge 2d338201 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline 



Steps on the way to 5.15-rc1

Resolves merge conflict in:
	fs/proc/base.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic554ca8447961e52fbc6f27d91470a816b59a771
parents 2febafed 2d338201
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment