From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Serge E. Hallyn" Subject: [PATCH ckpt-v19-rc2] smack: resolve merge conflicts Date: Wed, 2 Dec 2009 09:26:04 -0600 Message-ID: <20091202152604.GA13014@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Oren Laadan Cc: Linux Containers List-Id: containers.vger.kernel.org Fortunately they're trivial. Signed-off-by: Serge E. Hallyn --- 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