]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 May 2016 01:24:04 +0000 (18:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 May 2016 01:24:04 +0000 (18:24 -0700)
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


Trivial merge