Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 14 insertions, 2 deletions

diff --git a/security/dummy.c b/security/dummy.c
index 64f6da0f422e..c3c5493581e2 100644
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -191,7 +191,7 @@ static int dummy_sb_kern_mount (struct super_block *sb, void *data)
         return 0;
 }
 
-static int dummy_sb_statfs (struct super_block *sb)
+static int dummy_sb_statfs (struct dentry *dentry)
 {
         return 0;
 }
@@ -516,6 +516,11 @@ static int dummy_task_setnice (struct task_struct *p, int nice)
         return 0;
 }
 
+static int dummy_task_setioprio (struct task_struct *p, int ioprio)
+{
+        return 0;
+}
+
 static int dummy_task_setrlimit (unsigned int resource, struct rlimit *new_rlim)
 {
         return 0;
@@ -532,6 +537,11 @@ static int dummy_task_getscheduler (struct task_struct *p)
         return 0;
 }
 
+static int dummy_task_movememory (struct task_struct *p)
+{
+        return 0;
+}
+
 static int dummy_task_wait (struct task_struct *p)
 {
         return 0;
@@ -860,7 +870,7 @@ static int dummy_setprocattr(struct task_struct *p, char *name, void *value, siz
 }
 
 #ifdef CONFIG_KEYS
-static inline int dummy_key_alloc(struct key *key)
+static inline int dummy_key_alloc(struct key *key, struct task_struct *ctx)
 {
         return 0;
 }
@@ -972,9 +982,11 @@ void security_fixup_ops (struct security_operations *ops)
         set_to_dummy_if_null(ops, task_getsid);
         set_to_dummy_if_null(ops, task_setgroups);
         set_to_dummy_if_null(ops, task_setnice);
+        set_to_dummy_if_null(ops, task_setioprio);
         set_to_dummy_if_null(ops, task_setrlimit);
         set_to_dummy_if_null(ops, task_setscheduler);
         set_to_dummy_if_null(ops, task_getscheduler);
+        set_to_dummy_if_null(ops, task_movememory);
         set_to_dummy_if_null(ops, task_wait);
         set_to_dummy_if_null(ops, task_kill);
         set_to_dummy_if_null(ops, task_prctl);