← Back to branch summary

~ubuntu-branches/ubuntu/vivid/aufs/vivid

« back to all changes in this revision

Viewing changes to debian/patches/02_patches.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Julian Andres Klode
  • Date: 2007-12-15 23:32:51 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20071215233251-2vgs2lmg8mai5d9e
Tags: 0+20071211-1ubuntu1
https://launchpad.net/bugs/175705
* Merge from debian unstable (LP: #175705), remaining changes:
  - Fix for Ubuntu Kernels (updated)
* patches/01_vserver.dpatch: Removed
* patches/06_ubuntu.dpatch: Added (update of ubuntu patch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_patches.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 02_patches.dpatch by Julian Andres Klode <jak@jak-linux.org>
 
3
##
 
4
## DP: lhash-2.6.22.patch - remove first component of path
 
5
 
 
6
@DPATCH@
 
7
diff -urNad --exclude=.bzr --exclude='*~' aufs-0+20070806~/lhash-2.6.22.patch aufs-0+20070806/lhash-2.6.22.patch
 
8
--- aufs-0+20070806~/patch/lhash-2.6.22.patch   2007-07-15 22:08:18.000000000 +0200
 
9
+++ aufs-0+20070806/patch/lhash-2.6.22.patch    2007-08-06 15:48:18.074227638 +0200
 
10
@@ -1,11 +1,11 @@
 
11
-Index: linux-2.6.22/fs/namei.c
 
12
+Index: fs/namei.c
 
13
 ===================================================================
 
14
 RCS file: /ext1/sysadm/transparent/repository/linux-2.6.22/fs/namei.c,v
 
15
 retrieving revision 1.1
 
16
 retrieving revision 1.3
 
17
 diff -u -p -r1.1 -r1.3
 
18
---- linux-2.6.22/fs/namei.c    12 Jul 2007 02:55:19 -0000      1.1
 
19
-+++ linux-2.6.22/fs/namei.c    12 Jul 2007 03:00:50 -0000      1.3
 
20
+--- fs/namei.c 12 Jul 2007 02:55:19 -0000      1.1
 
21
++++ fs/namei.c 12 Jul 2007 03:00:50 -0000      1.3
 
22
 @@ -1280,7 +1280,7 @@ out:
 
23
   * needs parent already locked. Doesn't follow mounts.
 
24
   * SMP-safe.
 
25
@@ -23,14 +23,14 @@
 
26
  EXPORT_SYMBOL(lookup_one_len);
 
27
  EXPORT_SYMBOL(page_follow_link_light);
 
28
  EXPORT_SYMBOL(page_put_link);
 
29
-Index: linux-2.6.22/include/linux/namei.h
 
30
+Index: include/linux/namei.h
 
31
 ===================================================================
 
32
 RCS file: /ext1/sysadm/transparent/repository/linux-2.6.22/include/linux/namei.h,v
 
33
 retrieving revision 1.1
 
34
 retrieving revision 1.2
 
35
 diff -u -p -r1.1 -r1.2
 
36
---- linux-2.6.22/include/linux/namei.h 12 Jul 2007 02:55:19 -0000      1.1
 
37
-+++ linux-2.6.22/include/linux/namei.h 12 Jul 2007 02:55:20 -0000      1.2
 
38
+--- include/linux/namei.h      12 Jul 2007 02:55:19 -0000      1.1
 
39
++++ include/linux/namei.h      12 Jul 2007 02:55:20 -0000      1.2
 
40
 @@ -81,6 +81,7 @@ extern struct file *lookup_instantiate_f
 
41
  extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
 
42
  extern void release_open_intent(struct nameidata *);