From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Jun 2020 17:27:07 +0000 (-0700)
Subject: Merge tag 'keys-next-20200602' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe... 
X-Git-Tag: v5.8-rc1~159
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a484a497c98a0447aca2d70de19d11b1d66e6ef7;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'keys-next-20200602' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull keyring updates from David Howells:

 - Fix a documentation warning.

 - Replace a zero-length array with a flexible one

 - Make the big_key key type use ChaCha20Poly1305 and use the crypto
   algorithm directly rather than going through the crypto layer.

 - Implement the update op for the big_key type.

* tag 'keys-next-20200602' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  keys: Implement update for the big_key type
  security/keys: rewrite big_key crypto to use library interface
  KEYS: Replace zero-length array with flexible-array
  Documentation: security: core.rst: add missing argument
---

a484a497c98a0447aca2d70de19d11b1d66e6ef7