From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Feb 2017 20:25:42 +0000 (-0800)
Subject: Merge tag 'pstore-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
X-Git-Tag: v4.10-rc8~17
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2b369478e1856e3809f439495567474725931585;p=linux.git

Merge tag 'pstore-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull pstore fix from Kees Cook:
 "Fix pstore regression (boot Oops) when ftrace disabled, from Brian
  Norris"

* tag 'pstore-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore: don't OOPS when there are no ftrace zones
---

2b369478e1856e3809f439495567474725931585