Merge branch 'master' into for-linus

Conflicts:
	block/Kconfig

Signed-off-by: Jens Axboe <[email protected]>

diff --cc block/blk-sysfs.c
Simple merge

diff --cc drivers/block/drbd/drbd_int.h
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc fs/bio.c
Simple merge