Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git

# Conflicts:
#	drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
#	net/ceph/osd_client.c