Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
James Morris [Tue, 8 Mar 2011 00:38:10 +0000 (11:38 +1100)]
19 files changed:
1  2 
fs/btrfs/inode.c
fs/btrfs/xattr.c
fs/ext2/namei.c
fs/ext3/namei.c
fs/ext4/ialloc.c
fs/gfs2/inode.c
fs/jfs/namei.c
fs/namespace.c
fs/ocfs2/namei.c
fs/ocfs2/refcounttree.c
fs/reiserfs/namei.c
fs/xfs/linux-2.6/xfs_iops.c
include/linux/ext3_fs.h
include/linux/security.h
kernel/sysctl.c
security/security.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c

Simple merge
Simple merge
diff --cc fs/ext2/namei.c
Simple merge
diff --cc fs/ext3/namei.c
Simple merge
Simple merge
diff --cc fs/gfs2/inode.c
Simple merge
diff --cc fs/jfs/namei.c
Simple merge
diff --cc fs/namespace.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1662,10 -1665,9 +1665,9 @@@ int security_capset(struct cred *new, c
                    const kernel_cap_t *effective,
                    const kernel_cap_t *inheritable,
                    const kernel_cap_t *permitted);
 -int security_capable(int cap);
 +int security_capable(const struct cred *cred, int cap);
  int security_real_capable(struct task_struct *tsk, int cap);
  int security_real_capable_noaudit(struct task_struct *tsk, int cap);
- int security_sysctl(struct ctl_table *table, int op);
  int security_quotactl(int cmds, int type, int id, struct super_block *sb);
  int security_quota_on(struct dentry *dentry);
  int security_syslog(int type);
diff --cc kernel/sysctl.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge