packages: kernel/kernel-aufs2-unionfs.patch - resolve new conflict

[baggins]

Author: baggins                      Date: Mon Jul 11 20:01:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resolve new conflict

---- Files affected:
packages/kernel:
   kernel-aufs2-unionfs.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-aufs2-unionfs.patch
diff -u packages/kernel/kernel-aufs2-unionfs.patch:1.4 packages/kernel/kernel-aufs2-unionfs.patch:1.5
--- packages/kernel/kernel-aufs2-unionfs.patch:1.4	Mon Jul 11 11:46:53 2011
+++ packages/kernel/kernel-aufs2-unionfs.patch	Mon Jul 11 22:01:50 2011
@@ -39,6 +39,23 @@
  
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
+diff --git a/include/linux/namei.h b/include/linux/namei.h
+index eba45ea..21ed6c9 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -82,11 +82,11 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ extern int kern_path_parent(const char *, struct nameidata *);
+ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ 			   const char *, unsigned int, struct nameidata *);
++extern struct dentry *lookup_hash(struct nameidata *nd);
+ 
+ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+ 		int (*open)(struct inode *, struct file *));
+ 
+-extern struct dentry *lookup_hash(struct nameidata *nd);
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+ 
+ extern int follow_down_one(struct path *);
 diff --git a/include/linux/splice.h b/include/linux/splice.h
 index 997c3b4..be9a153 100644
 --- a/include/linux/splice.h
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs2-unionfs.patch?r1=1.4&r2=1.5&f=u