Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...

diff --cc block/bio-integrity.c
Simple merge

diff --cc block/bio.c
Simple merge

diff --cc drivers/md/dm-cache-target.c
Simple merge

diff --cc drivers/md/dm-thin.c
Simple merge

diff --cc fs/btrfs/volumes.h
Simple merge

diff --cc include/linux/blk_types.h
Simple merge

diff --cc net/vmw_vsock/vmci_transport.c
Simple merge