Merge branch 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 May 2020 02:43:13 +0000 (19:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 May 2020 02:43:13 +0000 (19:43 -0700)
commit79dede78c0573618e3137d3d8cbf78c84e25fabd
tree35396e8f3a4beb6db4f7887a8ad302148a768dcb
parent192ffb7515839b1cc8457e0a8c1e09783de019d3
parent54261af473be4c5481f6196064445d2945f2bdab
Merge branch 'for-v5.7' of git://git./linux/kernel/git/jmorris/linux-security

Pull security subsystem fix from James Morris:
 "Fix the default value of fs_context_parse_param hook"

* 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: Fix the default value of fs_context_parse_param hook