Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

# Conflicts:
#	Documentation/admin-guide/cgroup-v1/memory.rst
#	fs/buffer.c

# Conflicts:
#	fs/buffer.c
#	fs/hugetlbfs/inode.c
#	include/linux/fs.h
#	include/linux/migrate.h
#	mm/migrate.c
#	mm/migrate_device.c
#	mm/zsmalloc.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git

# Conflicts:
#	drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h

# Conflicts:
#	Documentation/devicetree/bindings/phy/nvidia,tegra194-xusb-padctl.yaml