Merge pull request #36775 from tchaikov/wip-spdk

spdk: pick up spdk v20.07

Reviewed-by: Neha Ojha <nojha@redhat.com>

diff --cc PendingReleaseNotes
Simple merge

diff --cc src/blk/spdk/NVMEDevice.cc
Simple merge

diff --cc src/common/legacy_config_opts.h
index cc60a1fe742b7e7b19f0b756288d17a690ae45e1,a73031f80179480efaf2d67918190b208d0f322d..ea16bc85cd71033284c341bdd7593daa68b15080
--- 1/src/common/legacy_config_opts.h
--- 2/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@@ -895,11 -895,8 +895,10 @@@ OPTION(bdev_debug_aio_log_age, OPT_DOUB
  // to the uio_pci_generic driver. The purpose is to prevent the case where
  // NVMe driver is loaded while osd is running.
  OPTION(bdev_nvme_unbind_from_kernel, OPT_BOOL)
- OPTION(bdev_nvme_retry_count, OPT_INT) // -1 means by default which is 4
  OPTION(bdev_enable_discard, OPT_BOOL)
  OPTION(bdev_async_discard, OPT_BOOL)
 +OPTION(bdev_flock_retry_interval, OPT_FLOAT)
 +OPTION(bdev_flock_retry, OPT_INT)
  
  OPTION(objectstore_blackhole, OPT_BOOL)
  

diff --cc src/common/options.cc
Simple merge