From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Aug 2018 01:13:10 +0000 (-0700)
Subject: Merge tag 'libnvdimm-for-4.19_misc' of gitolite.kernel.org:pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19-rc1~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=828bf6e904eb8fc8969333568802689fbbf07a40;p=users%2Fhch%2Fuuid.git

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

Pull libnvdimm updates from Dave Jiang:
 "Collection of misc libnvdimm patches for 4.19 submission:

   - Adding support to read locked nvdimm capacity.

   - Change test code to make DSM failure code injection an override.

   - Add support for calculate maximum contiguous area for namespace.

   - Add support for queueing a short ARS when there is on going ARS for
     nvdimm.

   - Allow NULL to be passed in to ->direct_access() for kaddr and pfn
     params.

   - Improve smart injection support for nvdimm emulation testing.

   - Fix test code that supports for emulating controller temperature.

   - Fix hang on error before devm_memremap_pages()

   - Fix a bug that causes user memory corruption when data returned to
     user for ars_status.

   - Maintainer updates for Ross Zwisler emails and adding Jan Kara to
     fsdax"

* tag 'libnvdimm-for-4.19_misc' of gitolite.kernel.org:pub/scm/linux/kernel/git/nvdimm/nvdimm:
  libnvdimm: fix ars_status output length calculation
  device-dax: avoid hang on error before devm_memremap_pages()
  tools/testing/nvdimm: improve emulation of smart injection
  filesystem-dax: Do not request kaddr and pfn when not required
  md/dm-writecache: Don't request pointer dummy_addr when not required
  dax/super: Do not request a pointer kaddr when not required
  tools/testing/nvdimm: kaddr and pfn can be NULL to ->direct_access()
  s390, dcssblk: kaddr and pfn can be NULL to ->direct_access()
  libnvdimm, pmem: kaddr and pfn can be NULL to ->direct_access()
  acpi/nfit: queue issuing of ars when an uc error notification comes in
  libnvdimm: Export max available extent
  libnvdimm: Use max contiguous area for namespace size
  MAINTAINERS: Add Jan Kara for filesystem DAX
  MAINTAINERS: update Ross Zwisler's email address
  tools/testing/nvdimm: Fix support for emulating controller temperature
  tools/testing/nvdimm: Make DSM failure code injection an override
  acpi, nfit: Prefer _DSM over _LSR for namespace label reads
  libnvdimm: Introduce locked DIMM capacity support
---

828bf6e904eb8fc8969333568802689fbbf07a40
diff --cc drivers/dax/super.c
index 45276abf03aa,c2f42b1f3363..6e928f37d084
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@@ -86,10 -86,8 +86,9 @@@ bool __bdev_dax_supported(struct block_
  {
  	struct dax_device *dax_dev;
  	bool dax_enabled = false;
 +	struct request_queue *q;
  	pgoff_t pgoff;
  	int err, id;
- 	void *kaddr;
  	pfn_t pfn;
  	long len;
  	char buf[BDEVNAME_SIZE];