Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 May 2014 02:25:56 +0000 (11:25 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 May 2014 02:25:56 +0000 (11:25 +0900)
commit68cb363a4ddc335fddf6e2ccb03e4a907ba7afbf
tree636ca2cf21ded393eca9b78d33dcb8e7eefde533
parentefb2b1d5fdf4be71d63d29b881bf3d6f93f53694
parent5a838c3b60e3a36ade764cf7751b8f17d7c9c2da
Merge branch 'for-3.15-fixes' of git://git./linux/kernel/git/tj/percpu

Pull a percpu fix from Tejun Heo:
 "Fix for a percpu allocator bug where it could try to kfree() a memory
  region allocated using vmalloc().  The bug has been there for years
  now and is unlikely to have ever triggered given the size of struct
  pcpu_chunk.  It's still theoretically possible and the fix is simple
  and safe enough, so the patch is marked with -stable"

* 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: make pcpu_alloc_chunk() use pcpu_mem_free() instead of kfree()