Merge remote-tracking branch 'linus/master' into testing

Conflicts:
	drivers/block/rbd.c