diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-10-25 18:05:23 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-10-25 18:05:23 -0600 |
| commit | 9e1f08607f904e89568e197f4e30985484a87fd7 (patch) | |
| tree | eb1e5388ce1d7f65302597c495f5b45b8b3d700e /drivers/nvdimm/Kconfig | |
| parent | bb118c56fda53fbca71ee8f35ff870d35370c969 (diff) | |
| parent | 3cbd4b543bef00c638fd63f6f043006c0c432f23 (diff) | |
| download | linux-stable-9e1f08607f904e89568e197f4e30985484a87fd7.tar.gz linux-stable-9e1f08607f904e89568e197f4e30985484a87fd7.tar.bz2 linux-stable-9e1f08607f904e89568e197f4e30985484a87fd7.zip | |
Merge branch 'mauro-books' into docs-next
Merge Mauro's massive patch series creating the process and admin-guide
books. I think there's a lot of stuff to clean up here, but there's no
point in holding things up for that.
Mauro sez:
This patch series continues the efforts of converting the Linux Kernel
documentation to Sphinx.
It contains text to ReST conversion of several files under Documentation,
and a few ones under the main dir (README, REPORTING-BUGS).
All patches on this series can be found on my development tree:
https://git.linuxtv.org/mchehab/experimental.git/log/?h=lkml-books-v2
The Kernel docs html output after this series can be seen at:
https://mchehab.fedorapeople.org/kernel_docs/
Diffstat (limited to 'drivers/nvdimm/Kconfig')
| -rw-r--r-- | drivers/nvdimm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig index 8b2b740d6679..b20ce7da1ee4 100644 --- a/drivers/nvdimm/Kconfig +++ b/drivers/nvdimm/Kconfig @@ -28,7 +28,7 @@ config BLK_DEV_PMEM non-standard OEM-specific E820 memory type (type-12, see CONFIG_X86_PMEM_LEGACY), or it is manually specified by the 'memmap=nn[KMG]!ss[KMG]' kernel command line (see - Documentation/kernel-parameters.txt). This driver converts + Documentation/admin-guide/kernel-parameters.rst). This driver converts these persistent memory ranges into block devices that are capable of DAX (direct-access) file system mappings. See Documentation/nvdimm/nvdimm.txt for more details. |