Merge 9832fb87 ("mm/demotion: expose memory tier details via sysfs") into android-mainline

Steps on the way to 6.1-rc1

resolves conflicts in:
	include/linux/nodemask.h

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