From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Aug 2020 17:59:19 +0000 (-0700)
Subject: Merge tag 'libnvdimm-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm... 
X-Git-Tag: v5.15~3129
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4bf5e3611895ede257d736b7359db669879a109f;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'libnvdimm-for-5.9' of git://git./linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm updayes from Vishal Verma:
 "You'd normally receive this pull request from Dan Williams, but he's
  busy watching a newborn (Congrats Dan!), so I'm watching libnvdimm
  this cycle.

  This adds a new feature in libnvdimm - 'Runtime Firmware Activation',
  and a few small cleanups and fixes in libnvdimm and DAX. I'd
  originally intended to make separate topic-based pull requests - one
  for libnvdimm, and one for DAX, but some of the DAX material fell out
  since it wasn't quite ready.

  Summary:

   - add 'Runtime Firmware Activation' support for NVDIMMs that
     advertise the relevant capability

   - misc libnvdimm and DAX cleanups"

* tag 'libnvdimm-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  libnvdimm/security: ensure sysfs poll thread woke up and fetch updated attr
  libnvdimm/security: the 'security' attr never show 'overwrite' state
  libnvdimm/security: fix a typo
  ACPI: NFIT: Fix ARS zero-sized allocation
  dax: Fix incorrect argument passed to xas_set_err()
  ACPI: NFIT: Add runtime firmware activate support
  PM, libnvdimm: Add runtime firmware activation support
  libnvdimm: Convert to DEVICE_ATTR_ADMIN_RO()
  drivers/dax: Expand lock scope to cover the use of addresses
  fs/dax: Remove unused size parameter
  dax: print error message by pr_info() in __generic_fsdax_supported()
  driver-core: Introduce DEVICE_ATTR_ADMIN_{RO,RW}
  tools/testing/nvdimm: Emulate firmware activation commands
  tools/testing/nvdimm: Prepare nfit_ctl_test() for ND_CMD_CALL emulation
  tools/testing/nvdimm: Add command debug messages
  tools/testing/nvdimm: Cleanup dimm index passing
  ACPI: NFIT: Define runtime firmware activation commands
  ACPI: NFIT: Move bus_dsm_mask out of generic nvdimm_bus_descriptor
  libnvdimm: Validate command family indices
---

4bf5e3611895ede257d736b7359db669879a109f
diff --cc drivers/acpi/nfit/nfit.h
index a303f0123394,67b7807ed200..c674f3df9be7
--- a/drivers/acpi/nfit/nfit.h
+++ b/drivers/acpi/nfit/nfit.h
@@@ -16,8 -16,9 +16,9 @@@
  /* ACPI 6.1 */
  #define UUID_NFIT_BUS "2f10e7a4-9e91-11e4-89d3-123b93f75cba"
  
 -/* http://pmem.io/documents/NVDIMM_DSM_Interface-V1.6.pdf */
 +/* https://pmem.io/documents/NVDIMM_DSM_Interface-V1.6.pdf */
  #define UUID_NFIT_DIMM "4309ac30-0d11-11e4-9191-0800200c9a66"
+ #define UUID_INTEL_BUS "c7d8acd4-2df8-4b82-9f65-a325335af149"
  
  /* https://github.com/HewlettPackard/hpe-nvm/blob/master/Documentation/ */
  #define UUID_NFIT_DIMM_N_HPE1 "9002c334-acf3-4c0e-9642-a235f0d53bc6"