Revert "Squashed update of BFQ-v6r1 to BFQ-v6r2"

This reverts commit fd6a96b633b517b2696168e567d38ec04a36c2f4.

Conflicts:

	block/bfq-ioc.c
	block/bfq-iosched.c
	block/bfq.h