From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 31 Mar 2016 11:56:50 +0000 (-0500)
Subject: Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c5bce408e4b53e4498ac75c3c39eaf7ca9b7f296;p=linux-beck.git

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()
---

c5bce408e4b53e4498ac75c3c39eaf7ca9b7f296