Merge ad57a1022f ("Merge tag 'exfat-for-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat") into android-mainline

Steps on the way to 5.8-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4bc42f572167ea2f815688b4d1eb6124b6d260d4
This commit is contained in:
Greg Kroah-Hartman
2020-06-24 17:54:12 +02:00
1402 changed files with 20269 additions and 11612 deletions

View File

@@ -5587,15 +5587,6 @@ static int __parse_numa_zonelist_order(char *s)
return 0;
}
static __init int setup_numa_zonelist_order(char *s)
{
if (!s)
return 0;
return __parse_numa_zonelist_order(s);
}
early_param("numa_zonelist_order", setup_numa_zonelist_order);
char numa_zonelist_order[] = "Node";
/*