Merge 'block' from https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git (for-next)

Merged-SHA: d433a4f15a72280e547779ea389e0924b483abfe

 drivers/block/rnbd/rnbd-clt.h | 2 +-
 drivers/block/ublk_drv.c      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)