[Devel] [PATCH ckpt-v19-rc2] smack: resolve merge conflicts

[Serge E. Hallyn]

Fortunately they're trivial.

Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
---
 security/smack/smack_lsm.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index e38b666..e0c9caa 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -3248,12 +3248,9 @@ struct security_operations smack_ops = {
 	.file_send_sigiotask = 		smack_file_send_sigiotask,
 	.file_receive = 		smack_file_receive,
 
-<<<<<<< current
 	.cred_alloc_blank =		smack_cred_alloc_blank,
-=======
 	.cred_checkpoint =		smack_cred_checkpoint,
 	.cred_restore =			smack_cred_restore,
->>>>>>> patched
 	.cred_free =			smack_cred_free,
 	.cred_prepare =			smack_cred_prepare,
 	.cred_commit =			smack_cred_commit,
@@ -3341,16 +3338,13 @@ struct security_operations smack_ops = {
 	.secid_to_secctx = 		smack_secid_to_secctx,
 	.secctx_to_secid = 		smack_secctx_to_secid,
 	.release_secctx = 		smack_release_secctx,
-<<<<<<< current
 	.inode_notifysecctx =		smack_inode_notifysecctx,
 	.inode_setsecctx =		smack_inode_setsecctx,
 	.inode_getsecctx =		smack_inode_getsecctx,
-=======
 #ifdef CONFIG_CHECKPOINT
 	.may_restart =			smack_may_restart,
 	.checkpoint_header =		smack_checkpoint_header,
 #endif
->>>>>>> patched
 };
 
 
-- 
1.6.0.4

_______________________________________________
Containers mailing list
Containers at lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers