Merge 6.1-rc6 into driver-core-next

We need the kernfs changes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc Documentation/driver-api/driver-model/devres.rst
Simple merge

diff --cc drivers/base/property.c
Simple merge

diff --cc drivers/infiniband/core/device.c
Simple merge

diff --cc fs/kernfs/dir.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc include/linux/blkdev.h
Simple merge