linux-next: manual merge of the integrity tree with the nfsd tree

Hi all, Today's linux-next merge of the integrity tree got a conflict in fs/nfsd/vfs.c between commit 9b638b816081 ("NFSD: Put file after ima_file_check fail in nfsd_open()") from the nfsd tree and commit e8442e203c25 ("ima: pass 'opened' flag to identify newly created files") from the integrity

linux-next: manual merge of the integrity tree with the nfsd tree

Hi all, Today's linux-next merge of the integrity tree got a conflict in fs/nfsd/vfs.c between commit 9b638b816081 (NFSD: Put file after ima_file_check fail in nfsd_open()) from the nfsd tree and commit e8442e203c25 (ima: pass 'opened' flag to identify newly created files) from the integrity