Merge 4.6-rc4 into driver-core-next

We want those fixes in here as well.

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

diff --cc drivers/firmware/qemu_fw_cfg.c
Simple merge

diff --cc fs/debugfs/inode.c
Simple merge

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