bcache: Minor fixes from kbuild robot

Signed-off-by: Kent Overstreet <kmo@daterainc.com>

diff --cc drivers/md/bcache/bset.c
Simple merge

diff --cc drivers/md/bcache/btree.c
Simple merge

diff --cc drivers/md/bcache/extents.c
Simple merge

diff --cc drivers/md/bcache/sysfs.c
Simple merge