From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 May 2016 01:24:04 +0000 (-0700)
Subject: Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim... 
X-Git-Tag: v4.14-rc1~3317
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d0bd9534c8ddaebee64e1b4b7d621915f65e994;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'libnvdimm-fixes' of git://git./linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm build fix from Dan Williams:
 "A build fix for the usage of HPAGE_SIZE in the last libnvdimm pull
  request.

  I have taken note that the kbuild robot build success test does not
  include results for alpha_allmodconfig.  Thanks to Guenter for the
  report.  It's tagged for -stable since the original fix will land
  there and cause build problems"

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure
---

2d0bd9534c8ddaebee64e1b4b7d621915f65e994