diff options
| author | Linus Torvalds | 2016-04-16 00:34:27 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-04-16 00:34:27 +0200 |
| commit | f3c9a1abbe9d4c9565fdb0755e2c7814f32d4f62 (patch) | |
| tree | 14e3ad5ade1e2f1b806fc466f30c1854866e85c4 /block | |
| parent | Merge tag 'for-linus-20160415' of git://git.infradead.org/linux-mtd (diff) | |
| parent | libnvdimm, pmem: clarify the write+clear_poison+write flow (diff) | |
| download | kernel-qcow2-linux-f3c9a1abbe9d4c9565fdb0755e2c7814f32d4f62.tar.gz kernel-qcow2-linux-f3c9a1abbe9d4c9565fdb0755e2c7814f32d4f62.tar.xz kernel-qcow2-linux-f3c9a1abbe9d4c9565fdb0755e2c7814f32d4f62.zip | |
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fixes from Ross Zwisler:
"Two fixes:
- Fix memcpy_from_pmem() to fallback to memcpy() for architectures
where CONFIG_ARCH_HAS_PMEM_API=n.
- Add a comment explaining why we write data twice when clearing
poison in pmem_do_bvec().
This has passed a boot test on an X86_32 config, which was the
architecture where issue #1 above was first noticed"
Dan Williams adds:
"We're giving this multi-maintainer setup a shot, so expect libnvdimm
pull requests from either Ross or I going forward"
* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
libnvdimm, pmem: clarify the write+clear_poison+write flow
pmem: fix BUG() error in pmem.h:48 on X86_32
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions