summaryrefslogtreecommitdiff
path: root/include/linux/toshiba.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-12 06:44:31 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-12 06:44:31 +0300
commit59c3cb553f5fc4ed6868eeaae6ffd8e1daf6d93e (patch)
tree4a69494ff0ced1e51d8a0a8041dae3d20b5ee455 /include/linux/toshiba.h
parente49251988b10e8787baa5f3d8ffd154e003f0963 (diff)
parentf0f2c072cf530d5b8890be5051cc8b36b0c54cce (diff)
downloadlinux-59c3cb553f5fc4ed6868eeaae6ffd8e1daf6d93e.tar.xz
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm
Pull libnvdimm fixes from Dan Williams: "1) Fixes for a handful of smatch reports (Thanks Dan C.!) and minor bug fixes (patches 1-6) 2) Correctness fixes to the BLK-mode nvdimm driver (patches 7-10). Granted these are slightly large for a -rc update. They have been out for review in one form or another since the end of May and were deferred from the merge window while we settled on the "PMEM API" for the PMEM-mode nvdimm driver (ie memremap_pmem, memcpy_to_pmem, and wmb_pmem). Now that those apis are merged we implement them in the BLK driver to guarantee that mmio aperture moves stay ordered with respect to incoming read/write requests, and that writes are flushed through those mmio-windows and platform-buffers to be persistent on media. These pass the sub-system unit tests with the updates to tools/testing/nvdimm, and have received a successful build-report from the kbuild robot (468 configs). With acks from Rafael for the touches to drivers/acpi/" * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm: nfit: add support for NVDIMM "latch" flag nfit: update block I/O path to use PMEM API tools/testing/nvdimm: add mock acpi_nfit_flush_address entries to nfit_test tools/testing/nvdimm: fix return code for unimplemented commands tools/testing/nvdimm: mock ioremap_wt pmem: add maintainer for include/linux/pmem.h nfit: fix smatch "use after null check" report nvdimm: Fix return value of nvdimm_bus_init() if class_create() fails libnvdimm: smatch cleanups in __nd_ioctl sparse: fix misplaced __pmem definition
Diffstat (limited to 'include/linux/toshiba.h')
0 files changed, 0 insertions, 0 deletions