Subject: linux-next: manual merge of the integrity tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 2 Feb 2018 11:09:28 +1100

Hi all,

Today's linux-next merge of the integrity tree got a conflict in:

  security/integrity/ima/ima_main.c

between commit:

  3b370b215f4b ("IMA: switch IMA over to new i_version API")

from Linus' tree and commit:

  d56f30ac85c0 ("ima: force re-appraisal on filesystems with FS_IMA_NO_CACHE")

from the integrity tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc security/integrity/ima/ima_main.c
index 2cfb0c714967,83edbad81f83..000000000000
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@@ -24,7 -24,7 +24,8 @@@
  #include <linux/slab.h>
  #include <linux/xattr.h>
  #include <linux/ima.h>
 +#include <linux/iversion.h>
+ #include <linux/fs.h>
  
  #include "ima.h"