+ "block, bfq: attempt to fix use-after-free which affects SLUB behavior (3.3.0 to 3.8.0)" - https://github.com/damentz/zen-kernel/commit/975bb74bfcf1c022ea49198dcd74efe14fe58d34

Conflicts:
	block/bfq-iosched.c