Merge branch 'for-5.13/drivers' into for-5.13/drivers-post-merge
authorJens Axboe <axboe@kernel.dk>
Tue, 20 Apr 2021 15:00:32 +0000 (09:00 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 20 Apr 2021 15:00:32 +0000 (09:00 -0600)
commit79ccb112c414988379b1c0e9db5f6e8ba82e3cc5
tree659556ce5297f3b1d134bfb0555a9774dbb6b169
parentbf05bf16c76bb44ab5156223e1e58e26dfe30a88
parent57b93ed435e6de049d190b5c1052c35d4b223631
Merge branch 'for-5.13/drivers' into for-5.13/drivers-post-merge

* for-5.13/drivers: (129 commits)
  block/rnbd: Use strscpy instead of strlcpy
  block/rnbd-clt-sysfs: Remove copy buffer overlap in rnbd_clt_get_path_name
  block/rnbd-clt: Remove max_segment_size
  block/rnbd-clt: Generate kobject_uevent when the rnbd device state changes
  block/rnbd-srv: Remove unused arguments of rnbd_srv_rdma_ev
  Documentation/ABI/rnbd-clt: Add description for nr_poll_queues
  block/rnbd-clt: Support polling mode for IO latency optimization
  block/rnbd-clt: Fix missing a memory free when unloading the module
  block/rnbd-clt: Improve find_or_create_sess() return check
  block/rnbd-srv: Remove force_close file after holding a lock
  block/rnbd-srv: Prevent a deadlock generated by accessing sysfs in parallel
  block/rnbd-clt: Replace {NO_WAIT,WAIT} with RTRS_PERMIT_{WAIT,NOWAIT}
  block/rnbd: Kill destroy_device_cb
  block/rnbd: Kill rnbd_clt_destroy_default_group
  block/rnbd-clt: Move add_disk(dev->gd) to rnbd_clt_setup_gen_disk
  block/rnbd-clt: Remove some arguments from rnbd_client_setup_device
  block/rnbd-clt: Remove some arguments from insert_dev_if_not_exists_devpath
  Documentation/sysfs-block-rnbd: Add descriptions for remap_device and resize
  MAINTAINERS: Change maintainer for rnbd module
  floppy: remove redundant assignment to variable st
  ...

Signed-off-by: Jens Axboe <axboe@kernel.dk>
15 files changed:
MAINTAINERS
drivers/block/floppy.c
drivers/block/null_blk/main.c
drivers/block/null_blk/null_blk.h
drivers/infiniband/ulp/rtrs/rtrs-clt.c
drivers/nvme/host/core.c
drivers/nvme/host/fc.c
drivers/nvme/host/rdma.c
drivers/nvme/host/tcp.c
drivers/nvme/target/core.c
drivers/nvme/target/loop.c
drivers/nvme/target/tcp.c
drivers/s390/block/dasd.c
fs/block_dev.c
include/linux/blkdev.h