Re: linux-next: manual merge of the keys tree with the ecryptfs tree

Hi all, On Wed, 26 Jun 2019 14:28:38 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the keys tree got a conflict in: > > fs/ecryptfs/keystore.c > > between commit: > > 29a51df0609c ("ecryptfs: remove unnessesary null check in > ecryptfs_keyring_auth_tok_for_sig") > > fro

linux-next: manual merge of the keys tree with the ecryptfs tree

Hi all, Today's linux-next merge of the keys tree got a conflict in: fs/ecryptfs/keystore.c between commit: 29a51df0609c ("ecryptfs: remove unnessesary null check in ecryptfs_keyring_auth_tok_for_sig") from the ecryptfs tree and commit: 79512db59dc8 ("keys: Replace uid/gid/perm permiss