]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
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)
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


Trivial merge