Subject: linux-next: manual merge of the security tree with the file-locks tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 19 Sep 2014 13:13:36 +1000

Hi James,

Today's linux-next merge of the security tree got a conflict in
security/smack/smack_lsm.c between commit 1f5a9ba7910c ("security: make
security_file_set_fowner, f_setown and __f_setown void return") from
the file-locks tree and commit 21c7eae21a21 ("Make Smack operate on
smack_known struct where it still used char*") from the security tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc security/smack/smack_lsm.c
index 69e5635d89e5,93dc876734a4..000000000000
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@@ -1394,7 -1574,8 +1574,7 @@@ static void smack_file_set_fowner(struc
  {
  	struct smack_known *skp = smk_of_current();
  
- 	file->f_security = skp->smk_known;
+ 	file->f_security = skp;
 -	return 0;
  }
  
  /**