block: BFQ update to v6r1

Signed-off-by: David Savage <bedalus@gmail.com>

Conflicts:
	block/bfq.h