[kernel] r11238 - in dists/etch-security/linux-2.6/debian: . arch arch/alpha arch/alpha/vserver arch/amd64 arch/amd64/vserver arch/amd64/xen arch/amd64/xen-vserver arch/arm arch/hppa arch/i386 arch/i386/vserver arch/i386/xen arch/i386/xen-vserver arch/ia64 arch/mips arch/mipsel arch/powerpc arch/powerpc/vserver arch/s390 arch/s390/vserver arch/sparc arch/sparc/vserver patches/bugfix patches/series
Dann Frazier
dannf at alioth.debian.org
Thu May 1 19:55:11 UTC 2008
Author: dannf
Date: Thu May 1 19:55:09 2008
New Revision: 11238
Log:
commit changes for 2.6.18.dfsg.1-18etch3
Added:
dists/etch-security/linux-2.6/debian/arch/alpha/abi-6.alpha-generic
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/alpha/abi-6.alpha-generic
dists/etch-security/linux-2.6/debian/arch/alpha/abi-6.alpha-legacy
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/alpha/abi-6.alpha-legacy
dists/etch-security/linux-2.6/debian/arch/alpha/abi-6.alpha-smp
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/alpha/abi-6.alpha-smp
dists/etch-security/linux-2.6/debian/arch/alpha/vserver/abi-6.alpha
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/alpha/vserver/abi-6.alpha
dists/etch-security/linux-2.6/debian/arch/amd64/abi-6.amd64
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/amd64/abi-6.amd64
dists/etch-security/linux-2.6/debian/arch/amd64/vserver/abi-6.amd64
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/amd64/vserver/abi-6.amd64
dists/etch-security/linux-2.6/debian/arch/amd64/xen-vserver/abi-6.amd64
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/amd64/xen-vserver/abi-6.amd64
dists/etch-security/linux-2.6/debian/arch/amd64/xen/abi-6.amd64
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/amd64/xen/abi-6.amd64
dists/etch-security/linux-2.6/debian/arch/arm/abi-6.footbridge
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/arm/abi-6.footbridge
dists/etch-security/linux-2.6/debian/arch/arm/abi-6.iop32x
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/arm/abi-6.iop32x
dists/etch-security/linux-2.6/debian/arch/arm/abi-6.ixp4xx
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/arm/abi-6.ixp4xx
dists/etch-security/linux-2.6/debian/arch/arm/abi-6.rpc
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/arm/abi-6.rpc
dists/etch-security/linux-2.6/debian/arch/arm/abi-6.s3c2410
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/arm/abi-6.s3c2410
dists/etch-security/linux-2.6/debian/arch/hppa/abi-6.parisc
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/hppa/abi-6.parisc
dists/etch-security/linux-2.6/debian/arch/hppa/abi-6.parisc-smp
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/hppa/abi-6.parisc-smp
dists/etch-security/linux-2.6/debian/arch/hppa/abi-6.parisc64
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/hppa/abi-6.parisc64
dists/etch-security/linux-2.6/debian/arch/hppa/abi-6.parisc64-smp
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/hppa/abi-6.parisc64-smp
dists/etch-security/linux-2.6/debian/arch/i386/abi-6.486
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/i386/abi-6.486
dists/etch-security/linux-2.6/debian/arch/i386/abi-6.686
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/i386/abi-6.686
dists/etch-security/linux-2.6/debian/arch/i386/abi-6.686-bigmem
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/i386/abi-6.686-bigmem
dists/etch-security/linux-2.6/debian/arch/i386/abi-6.amd64
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/i386/abi-6.amd64
dists/etch-security/linux-2.6/debian/arch/i386/abi-6.k7
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/i386/abi-6.k7
dists/etch-security/linux-2.6/debian/arch/i386/vserver/abi-6.686
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/i386/vserver/abi-6.686
dists/etch-security/linux-2.6/debian/arch/i386/vserver/abi-6.k7
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/i386/vserver/abi-6.k7
dists/etch-security/linux-2.6/debian/arch/i386/xen-vserver/abi-6.686
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/i386/xen-vserver/abi-6.686
dists/etch-security/linux-2.6/debian/arch/i386/xen/abi-6.686
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/i386/xen/abi-6.686
dists/etch-security/linux-2.6/debian/arch/ia64/abi-6.itanium
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/ia64/abi-6.itanium
dists/etch-security/linux-2.6/debian/arch/ia64/abi-6.mckinley
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/ia64/abi-6.mckinley
dists/etch-security/linux-2.6/debian/arch/mips/abi-6.qemu
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mips/abi-6.qemu
dists/etch-security/linux-2.6/debian/arch/mips/abi-6.r4k-ip22
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mips/abi-6.r4k-ip22
dists/etch-security/linux-2.6/debian/arch/mips/abi-6.r5k-ip32
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mips/abi-6.r5k-ip32
dists/etch-security/linux-2.6/debian/arch/mips/abi-6.sb1-bcm91250a
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mips/abi-6.sb1-bcm91250a
dists/etch-security/linux-2.6/debian/arch/mips/abi-6.sb1a-bcm91480b
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mips/abi-6.sb1a-bcm91480b
dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.qemu
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.qemu
dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.r3k-kn02
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.r3k-kn02
dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.r4k-kn04
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.r4k-kn04
dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.r5k-cobalt
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.r5k-cobalt
dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.sb1-bcm91250a
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.sb1-bcm91250a
dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.sb1a-bcm91480b
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/mipsel/abi-6.sb1a-bcm91480b
dists/etch-security/linux-2.6/debian/arch/powerpc/abi-6.powerpc
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/powerpc/abi-6.powerpc
dists/etch-security/linux-2.6/debian/arch/powerpc/abi-6.powerpc-miboot
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/powerpc/abi-6.powerpc-miboot
dists/etch-security/linux-2.6/debian/arch/powerpc/abi-6.powerpc-smp
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/powerpc/abi-6.powerpc-smp
dists/etch-security/linux-2.6/debian/arch/powerpc/abi-6.powerpc64
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/powerpc/abi-6.powerpc64
dists/etch-security/linux-2.6/debian/arch/powerpc/abi-6.prep
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/powerpc/abi-6.prep
dists/etch-security/linux-2.6/debian/arch/powerpc/vserver/abi-6.powerpc
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/powerpc/vserver/abi-6.powerpc
dists/etch-security/linux-2.6/debian/arch/powerpc/vserver/abi-6.powerpc64
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/powerpc/vserver/abi-6.powerpc64
dists/etch-security/linux-2.6/debian/arch/s390/abi-6.s390
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/s390/abi-6.s390
dists/etch-security/linux-2.6/debian/arch/s390/abi-6.s390x
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/s390/abi-6.s390x
dists/etch-security/linux-2.6/debian/arch/s390/vserver/abi-6.s390x
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/s390/vserver/abi-6.s390x
dists/etch-security/linux-2.6/debian/arch/sparc/abi-6.sparc32
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/sparc/abi-6.sparc32
dists/etch-security/linux-2.6/debian/arch/sparc/abi-6.sparc64
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/sparc/abi-6.sparc64
dists/etch-security/linux-2.6/debian/arch/sparc/abi-6.sparc64-smp
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/sparc/abi-6.sparc64-smp
dists/etch-security/linux-2.6/debian/arch/sparc/vserver/abi-6.sparc64
- copied unchanged from r11235, /dists/etch-security/linux-2.6/debian/arch/sparc/vserver/abi-6.sparc64
dists/etch-security/linux-2.6/debian/patches/bugfix/dnotify-race-avoid-abi-change.patch
dists/etch-security/linux-2.6/debian/patches/series/18etch3
Modified:
dists/etch-security/linux-2.6/debian/arch/defines
dists/etch-security/linux-2.6/debian/changelog
Modified: dists/etch-security/linux-2.6/debian/arch/defines
==============================================================================
--- dists/etch-security/linux-2.6/debian/arch/defines (original)
+++ dists/etch-security/linux-2.6/debian/arch/defines Thu May 1 19:55:09 2008
@@ -1,5 +1,5 @@
[abi]
-abiname: 7
+abiname: 6
[base]
arches:
Modified: dists/etch-security/linux-2.6/debian/changelog
==============================================================================
--- dists/etch-security/linux-2.6/debian/changelog (original)
+++ dists/etch-security/linux-2.6/debian/changelog Thu May 1 19:55:09 2008
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.18.dfsg.1-18etch3) stable-security; urgency=high
+
+ * Wrap added code in bugfix/dnotify-race-avoid-abi-change.patch in
+ #ifndef __GENKSYMS__ to avoid ABI change
+ * Revert ABI change introduced in 2.6.18.dfsg.1-18etch2
+
+ -- dann frazier <dannf at debian.org> Wed, 23 Apr 2008 21:34:26 -0600
+
linux-2.6 (2.6.18.dfsg.1-18etch2) stable-security; urgency=high
* bugfix/powerpc-chrp-null-deref.patch
Added: dists/etch-security/linux-2.6/debian/patches/bugfix/dnotify-race-avoid-abi-change.patch
==============================================================================
--- (empty file)
+++ dists/etch-security/linux-2.6/debian/patches/bugfix/dnotify-race-avoid-abi-change.patch Thu May 1 19:55:09 2008
@@ -0,0 +1,25 @@
+diff -urpN linux-source-2.6.18.orig/fs/dnotify.c linux-source-2.6.18/fs/dnotify.c
+--- linux-source-2.6.18.orig/fs/dnotify.c 2008-04-12 00:25:30.000000000 -0600
++++ linux-source-2.6.18/fs/dnotify.c 2008-04-23 21:32:55.000000000 -0600
+@@ -20,7 +20,9 @@
+ #include <linux/init.h>
+ #include <linux/spinlock.h>
+ #include <linux/slab.h>
++#ifndef __GENKSYMS__
+ #include <linux/file.h>
++#endif
+
+ int dir_notify_enable __read_mostly = 1;
+
+@@ -93,9 +95,11 @@ int fcntl_dirnotify(int fd, struct file
+ prev = &odn->dn_next;
+ }
+
++#ifndef __GENKSYMS__
+ /* we'd lost the race with close(), sod off silently */
+ if (fcheck(fd) != filp)
+ goto out_free;
++#endif
+
+ error = f_setown(filp, current->pid, 0);
+ if (error)
Added: dists/etch-security/linux-2.6/debian/patches/series/18etch3
==============================================================================
--- (empty file)
+++ dists/etch-security/linux-2.6/debian/patches/series/18etch3 Thu May 1 19:55:09 2008
@@ -0,0 +1 @@
++ bugfix/dnotify-race-avoid-abi-change.patch
More information about the Kernel-svn-changes
mailing list