[PATCH 2/4] block: cgroups, kconfig, build bits for BFQ-v6r2-3.1

Conflicts:
	include/linux/cgroup_subsys.h