Merge tag 'libnvdimm-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

Pull libnvdimm updates from Dan Williams:
 "Small collection of cleanups to rework usage of ->queuedata and the
  GUID api"

* tag 'libnvdimm-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  nvdimm/pmem: stop using ->queuedata
  nvdimm/btt: stop using ->queuedata
  nvdimm/blk: stop using ->queuedata
  libnvdimm: Replace guid_copy() with import_guid() where it makes sense

diff --cc drivers/nvdimm/blk.c
index 036e23a,ffe4728..39030a3
--- 1/drivers/nvdimm/blk.c
--- 2/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@@ -176,11 -176,8 +176,10 @@@ static blk_qc_t nd_blk_make_request(str
                return BLK_QC_T_NONE;
  
        bip = bio_integrity(bio);
-       nsblk = q->queuedata;
        rw = bio_data_dir(bio);
 -      do_acct = nd_iostat_start(bio, &start);
 +      do_acct = blk_queue_io_stat(bio->bi_disk->queue);
 +      if (do_acct)
 +              start = bio_start_io_acct(bio);
        bio_for_each_segment(bvec, bio, iter) {
                unsigned int len = bvec.bv_len;
  

diff --cc drivers/nvdimm/btt.c
Simple merge

diff --cc drivers/nvdimm/pmem.c
Simple merge