Skip to content

Commit 5ea6718

Browse files
torvaldstorvalds
committed
Merge tag 'libnvdimm-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm updates from Dan Williams: "The bulk of this has been in -next since before the merge window opened, with no known collisions / issues reported. The only detail worth noting, outside the summary below, is that the "libnvdimm-start-pad" topic has been truncated to just cleanups and small fixes. The full topic branch would have doubled down on hacks around the "section alignment" limitation of the core-mm, instead effort is now being spent to address that root issue in the memory hotplug implementation for v5.2. - Fix nfit-bus command submission regression - Support retrieval of short-ARS results if the ARS state is "requires continuation", and even if the "no_init_ars" module parameter is specified - Allow busy-polling of the kernel ARS state by allowing root to reset the exponential back-off timer - Filter potentially stale ARS results by tracking query-ARS relative to the previous start-ARS - Enhance dax_device alignment checks - Add support for the Hyper-V family of device-specific-methods (DSMs) - Add several fixes and workarounds for Hyper-V compatibility - Fix support to cache the dirty-shutdown-count at init" * tag 'libnvdimm-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (25 commits) libnvdimm/namespace: Clean up holder_class_store() libnvdimm/of_pmem: Fix platform_no_drv_owner.cocci warnings acpi/nfit: Update NFIT flags error message libnvdimm/btt: Fix LBA masking during 'free list' population libnvdimm/btt: Remove unnecessary code in btt_freelist_init libnvdimm/pfn: Remove dax_label_reserve dax: Check the end of the block-device capacity with dax_direct_access() nfit/ars: Avoid stale ARS results nfit/ars: Allow root to busy-poll the ARS state machine nfit/ars: Introduce scrub_flags nfit/ars: Remove ars_start_flags nfit/ars: Attempt short-ARS even in the no_init_ars case nfit/ars: Attempt a short-ARS whenever the ARS state is idle at boot acpi/nfit: Require opt-in for read-only label configurations libnvdimm/pmem: Honor force_raw for legacy pmem regions libnvdimm/pfn: Account for PAGE_SIZE > info-block-size in nd_pfn_init() libnvdimm: Fix altmap reservation size calculation libnvdimm, pfn: Fix over-trim in trim_pfn_device() acpi/nfit: Fix bus command validation libnvdimm/dimm: Add a no-BLK quirk based on NVDIMM family ...
2 parents 3bb0f28 + 4083014 commit 5ea6718

File tree

15 files changed

+273
-113
lines changed

15 files changed

+273
-113
lines changed

‎MAINTAINERS

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4643,20 +4643,21 @@ S: Maintained
46434643
F: drivers/i2c/busses/i2c-diolan-u2c.c
46444644

46454645
FILESYSTEM DIRECT ACCESS (DAX)
4646-
M: Matthew Wilcox <willy@infradead.org>
4647-
M: Ross Zwisler <zwisler@kernel.org>
4648-
M: Jan Kara <jack@suse.cz>
4646+
M: Dan Williams <dan.j.williams@intel.com>
4647+
R: Matthew Wilcox <willy@infradead.org>
4648+
R: Jan Kara <jack@suse.cz>
46494649
L: linux-fsdevel@vger.kernel.org
4650+
L: linux-nvdimm@lists.01.org
46504651
S: Supported
46514652
F: fs/dax.c
46524653
F: include/linux/dax.h
46534654
F: include/trace/events/fs_dax.h
46544655

46554656
DEVICE DIRECT ACCESS (DAX)
46564657
M: Dan Williams <dan.j.williams@intel.com>
4657-
M: Dave Jiang <dave.jiang@intel.com>
4658-
M: Ross Zwisler <zwisler@kernel.org>
46594658
M: Vishal Verma <vishal.l.verma@intel.com>
4659+
M: Keith Busch <keith.busch@intel.com>
4660+
M: Dave Jiang <dave.jiang@intel.com>
46604661
L: linux-nvdimm@lists.01.org
46614662
S: Supported
46624663
F: drivers/dax/
@@ -8812,7 +8813,6 @@ S: Maintained
88128813
F: tools/lib/lockdep/
88138814

88148815
LIBNVDIMM BLK: MMIO-APERTURE DRIVER
8815-
M: Ross Zwisler <zwisler@kernel.org>
88168816
M: Dan Williams <dan.j.williams@intel.com>
88178817
M: Vishal Verma <vishal.l.verma@intel.com>
88188818
M: Dave Jiang <dave.jiang@intel.com>
@@ -8825,15 +8825,13 @@ F: drivers/nvdimm/region_devs.c
88258825
LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
88268826
M: Vishal Verma <vishal.l.verma@intel.com>
88278827
M: Dan Williams <dan.j.williams@intel.com>
8828-
M: Ross Zwisler <zwisler@kernel.org>
88298828
M: Dave Jiang <dave.jiang@intel.com>
88308829
L: linux-nvdimm@lists.01.org
88318830
Q: https://patchwork.kernel.org/project/linux-nvdimm/list/
88328831
S: Supported
88338832
F: drivers/nvdimm/btt*
88348833

88358834
LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
8836-
M: Ross Zwisler <zwisler@kernel.org>
88378835
M: Dan Williams <dan.j.williams@intel.com>
88388836
M: Vishal Verma <vishal.l.verma@intel.com>
88398837
M: Dave Jiang <dave.jiang@intel.com>
@@ -8852,9 +8850,10 @@ F: Documentation/devicetree/bindings/pmem/pmem-region.txt
88528850

88538851
LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
88548852
M: Dan Williams <dan.j.williams@intel.com>
8855-
M: Ross Zwisler <zwisler@kernel.org>
88568853
M: Vishal Verma <vishal.l.verma@intel.com>
88578854
M: Dave Jiang <dave.jiang@intel.com>
8855+
M: Keith Busch <keith.busch@intel.com>
8856+
M: Ira Weiny <ira.weiny@intel.com>
88588857
L: linux-nvdimm@lists.01.org
88598858
Q: https://patchwork.kernel.org/project/linux-nvdimm/list/
88608859
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git

0 commit comments

Comments
 (0)