]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 23:42:10 +0000 (16:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 23:42:10 +0000 (16:42 -0700)
commit70eba4226d9718946941c7be0c8cb66d431e7686
tree822ba5d9751731d954895e69cf1456cb803ff944
parent2d4fe27850420606155fb1f7d18ab2b40153e67b
parent47110b88912a997f25d42373e339804d51da98de
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull trivial pstore update from Tony Luck:
 "Couple of pstore cleanups"

It turns out that the kmemdup() conversion ends up being undone by the
fact that the memory block also needed the ecc information (see commit
bd08ec33b5c2: "pstore/ram: Restore ecc information block"), so all that
remains after merging is the error return code change.

* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  pstore/ram: fix error return code in ramoops_probe()
  fs: pstore: Replaced calls to kmalloc and memcpy with kmemdup
fs/pstore/ram.c