- more fixes

Changed files:
    kernel-unionfs.patch -> 1.8
    kernel-vserver-fixes.patch -> 1.12

diff --git a/kernel-unionfs.patch b/kernel-unionfs.patch
index 9a94ec59e42b465364d9cd9757c2cc53179b8136..c97da2c36064542b292c942f725dc52b7df08d2d 100644 (file)
--- a/kernel-unionfs.patch
+++ b/kernel-unionfs.patch
@@ -11205,3 +11205,21 @@ index dc7674f..aa3f061 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
+
+--- linux-2.6.33/include/linux/namei.h 2010-02-26 09:23:55.450349051 +0100
++++ linux-2.6.33/include/linux/namei.h 2010-02-26 09:23:46.603683390 +0100
+@@ -72,6 +72,7 @@
+ 
+ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+               int (*open)(struct inode *, struct file *));
++extern void release_open_intent(struct nameidata *);
+ 
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+ 
+--- linux-2.6.33/fs/internal.h 2010-02-26 09:23:55.450349051 +0100
++++ linux-2.6.33/fs/internal.h 2010-02-26 09:23:51.287016217 +0100
+@@ -91,4 +91,3 @@
+  */
+ struct nameidata;
+ extern struct file *nameidata_to_filp(struct nameidata *);
+-extern void release_open_intent(struct nameidata *);

diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index 4717fd69713cb70cb799f10b8fe4980b4e4754e9..fcc45bbd2640b9a28d187e14b5d13fc82c0d283d 100644 (file)
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -36,3 +36,14 @@ Missing header for routes patch, caused vs2.3 route.h mixing
                (int)strcspn(init_utsname()->version, " "),
                init_utsname()->version);
 
+--- kernel-nogrsecurity-2.6.33/linux-2.6.33/drivers/infiniband/core/addr.c~    2010-02-24 19:52:17.000000000 +0100
++++ kernel-nogrsecurity-2.6.33/linux-2.6.33/drivers/infiniband/core/addr.c     2010-02-26 09:38:01.634013387 +0100
+@@ -251,7 +251,7 @@
+ 
+       if (ipv6_addr_any(&fl.fl6_src)) {
+               ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
+-                                       &fl.fl6_dst, 0, &fl.fl6_src);
++                                       &fl.fl6_dst, 0, &fl.fl6_src, NULL);
+               if (ret)
+                       goto put;
+