Merge branch 'topic/uek-4.1/dtrace' into uek/uek-next

* topic/uek-4.1/dtrace:
  dtrace: improve io provider coverage

diff --cc block/bio.c
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge

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