diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-31 06:56:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-31 06:56:50 -0500 |
| commit | c5bce408e4b53e4498ac75c3c39eaf7ca9b7f296 (patch) | |
| tree | 018b4fc5db6c0e9d69bcfdd1852853f112ef79ce /tools/perf/scripts/python | |
| parent | Merge tag 'nios2-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 (diff) | |
| parent | x86, pmem: use memcpy_mcsafe() for memcpy_from_pmem() (diff) | |
| download | wireguard-linux-c5bce408e4b53e4498ac75c3c39eaf7ca9b7f296.tar.xz wireguard-linux-c5bce408e4b53e4498ac75c3c39eaf7ca9b7f296.zip | |
Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull nvdimm mcsafe_memcpy use from Dan Williams:
"Now that mcsafe_memcpy() has landed, and the return value was been
clarified in commit cbf8b5a2b649 ("x86/mm, x86/mce: Fix return
type/value for memcpy_mcsafe()"), let's hook up its primary usage in
the pmem driver.
The compilation problems from the initial posting have been fixed,
this has appeared in a -next release with no reported issues, and it
picked up an ack from Ingo. There is no pressing need to merge this
in 4.6- rc2. However, if we wait until 4.7 the new memcpy_mcsafe()
capability will ship without a user in 4.6-final"
* 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
x86, pmem: use memcpy_mcsafe() for memcpy_from_pmem()
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions