Merge tag 'ecryptfs-5.6-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Feb 2020 05:08:37 +0000 (21:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Feb 2020 05:08:37 +0000 (21:08 -0800)
commitb1da3acc781ce445445d959b41064d209a27bc2d
treec85eae730763b4fb3d0986801de9e8b6a77e1094
parenteaea2947063ac694cddff1787d43e7807490dbc7
parent2c2a7552dd6465e8fde6bc9cccf8d66ed1c1eb72
Merge tag 'ecryptfs-5.6-rc3-fixes' of git://git./linux/kernel/git/tyhicks/ecryptfs

Pull eCryptfs fixes from Tyler Hicks:

 - downgrade the eCryptfs maintenance status to "Odd Fixes"

 - change my email address

 - fix a couple memory leaks in error paths

 - stability improvement to avoid a needless BUG_ON()

* tag 'ecryptfs-5.6-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  ecryptfs: replace BUG_ON with error handling code
  eCryptfs: Replace deactivated email address
  MAINTAINERS: eCryptfs: Update maintainer address and downgrade status
  ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()
  ecryptfs: fix a memory leak bug in parse_tag_1_packet()
MAINTAINERS
fs/ecryptfs/crypto.c
fs/ecryptfs/keystore.c