diff options
| author |   Stefaan De Roeck <stefaan@gentoo.org> | 2008-04-06 18:28:02 +0000 |
|---|---|---|
| committer | Stefaan De Roeck <stefaan@gentoo.org> | 2008-04-06 18:28:02 +0000 |
| commit | 784bbe07d562cdd35faf418931a19d9c360c992b (patch) | |
| tree | 0405cc092337b01822f7dcc08382cb08eb0b8887 /net-fs | |
| parent | Added ~ppc; bug #195815 (diff) | |
| download | gentoo-2-784bbe07d562cdd35faf418931a19d9c360c992b.tar.gz gentoo-2-784bbe07d562cdd35faf418931a19d9c360c992b.tar.bz2 gentoo-2-784bbe07d562cdd35faf418931a19d9c360c992b.zip | |
Adapt cvs-mangled patches, fixing bug #216465
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/openafs-kernel/ChangeLog | 7 | ||||
| -rw-r--r-- | net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402 | 12 | ||||
| -rw-r--r-- | net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402 | 9 |
3 files changed, 8 insertions, 20 deletions
diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog index 18083546a803..ef1ea8bc9815 100644 --- a/net-fs/openafs-kernel/ChangeLog +++ b/net-fs/openafs-kernel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-fs/openafs-kernel # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.103 2008/04/05 09:26:54 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.104 2008/04/06 18:28:01 stefaan Exp $ + + 06 Apr 2008; Stefaan De Roeck <stefaan@gentoo.org> + files/STABLE14-linux-flush-compare-20080402, + files/STABLE14-linux-flush-unlock-20080402: + Adapt cvs-mangled patches, fixing bug #216465 04 Apr 2008; Stefaan De Roeck <stefaan@gentoo.org> -openafs-kernel-1.2.13.ebuild, -openafs-kernel-1.4.5.ebuild, diff --git a/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402 b/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402 index f4ed02b6801f..faeb752a63b1 100644 --- a/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402 +++ b/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402 @@ -1,18 +1,10 @@ -CS file: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v +=================================================================== +RCS file: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v retrieving revision 1.81.2.62 retrieving revision 1.81.2.63 diff -u -r1.81.2.62 -r1.81.2.63 --- openafs/src/afs/LINUX/osi_vnodeops.c 2008/04/02 13:11:42 1.81.2.62 +++ openafs/src/afs/LINUX/osi_vnodeops.c 2008/04/02 18:27:13 1.81.2.63 -@@ -22,7 +22,7 @@ - #include "afs/param.h" - - RCSID -- ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $"); -+ ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $"); - - #include "afs/sysincludes.h" - #include "afsincludes.h" @@ -570,7 +570,7 @@ AFS_GLOCK(); diff --git a/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402 b/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402 index f76815810664..1261810ee099 100644 --- a/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402 +++ b/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402 @@ -5,15 +5,6 @@ retrieving revision 1.81.2.62 diff -u -r1.81.2.61 -r1.81.2.62 --- openafs/src/afs/LINUX/osi_vnodeops.c 2008/03/26 04:17:32 1.81.2.61 +++ openafs/src/afs/LINUX/osi_vnodeops.c 2008/04/02 13:11:42 1.81.2.62 -@@ -22,7 +22,7 @@ - #include "afs/param.h" - - RCSID -- ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $"); -+ ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $"); - - #include "afs/sysincludes.h" - #include "afsincludes.h" @@ -570,8 +570,10 @@ AFS_GLOCK(); |