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

Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

2 files changed, 5 insertions, 5 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index b6061fa29da7..3fdc49c6a02c 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -211,12 +211,12 @@ static inline void key_alloc_serial(struct key *key)
                         key->serial = 2;
                 key_serial_next = key->serial + 1;
 
-                if (!parent->rb_parent)
+                if (!rb_parent(parent))
                         p = &key_serial_tree.rb_node;
-                else if (parent->rb_parent->rb_left == parent)
-                        p = &parent->rb_parent->rb_left;
+                else if (rb_parent(parent)->rb_left == parent)
+                        p = &(rb_parent(parent)->rb_left);
                 else
-                        p = &parent->rb_parent->rb_right;
+                        p = &(rb_parent(parent)->rb_right);
 
                 parent = rb_next(parent);
                 if (!parent)
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index c284dbb8b8c0..e9548bc049e1 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1980,7 +1980,7 @@ int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
                 break;
         case AUDIT_SE_SEN:
         case AUDIT_SE_CLR:
-                level = (op == AUDIT_SE_SEN ?
+                level = (field == AUDIT_SE_SEN ?
                          &ctxt->range.level[0] : &ctxt->range.level[1]);
                 switch (op) {
                 case AUDIT_EQUAL: