[PATCH 1/4] block: prepare I/O context code for BFQ-v6r2 for 3.1

Conflicts:
	block/Kconfig.iosched