From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Morris <jmorris@namei•org>, Jeff Layton <jlayton@poochiereds•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>,
Lukasz Pawelczyk <l.pawelczyk@samsung•com>
Subject: linux-next: manual merge of the security tree with the file-locks tree
Date: Fri, 19 Sep 2014 13:13:36 +1000 [thread overview]
Message-ID: <20140919131336.75ee47d6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 908 bytes --]
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 sfr@canb•auug.org.au
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;
}
/**
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-09-19 3:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140919131336.75ee47d6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@lst$(echo .)de \
--cc=jlayton@poochiereds$(echo .)net \
--cc=jmorris@namei$(echo .)org \
--cc=l.pawelczyk@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox