Merge remote-tracking branch 'hsi/for-next'

diff --cc Documentation/DocBook/device-drivers.tmpl
Simple merge

diff --cc Documentation/ioctl/ioctl-number.txt
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc include/linux/Kbuild
Simple merge