r3785 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

Simon Horman horms at costa.debian.org
Tue Aug 9 10:49:41 UTC 2005


Author: horms
Date: 2005-08-09 10:49:40 +0000 (Tue, 09 Aug 2005)
New Revision: 3785

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/178_fs_ext2_ext3_xattr-sharing.diff
Log:
fix diffing

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/178_fs_ext2_ext3_xattr-sharing.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/178_fs_ext2_ext3_xattr-sharing.diff	2005-08-09 09:39:15 UTC (rev 3784)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/178_fs_ext2_ext3_xattr-sharing.diff	2005-08-09 10:49:40 UTC (rev 3785)
@@ -5,8 +5,8 @@
 # Ref: http://acl.bestbits.at/pipermail/acl-devel/2005-February/001848.html
 # Ref: http://www.novell.com/linux/security/advisories/2005_18_kernel.html
 # Ref: http://lists.debian.org/debian-kernel/2005/08/msg00238.html
---- fs/ext2/xattr.c.orig	2005-08-09 17:59:44.000000000 +0900
-+++ fs/ext2/xattr.c	2005-08-09 17:59:46.000000000 +0900
+--- a/fs/ext2/xattr.c	2005-08-09 17:59:44.000000000 +0900
++++ b/fs/ext2/xattr.c	2005-08-09 17:59:46.000000000 +0900
 @@ -977,6 +977,7 @@
  		if (IS_LAST_ENTRY(entry2))
  			return 1;
@@ -15,8 +15,8 @@
  		    entry1->e_name_len != entry2->e_name_len ||
  		    entry1->e_value_size != entry2->e_value_size ||
  		    memcmp(entry1->e_name, entry2->e_name, entry1->e_name_len))
---- fs/ext3/xattr.c.orig	2005-08-09 17:58:31.000000000 +0900
-+++ fs/ext3/xattr.c	2005-08-09 17:58:50.000000000 +0900
+--- a/fs/ext3/xattr.c	2005-08-09 17:58:31.000000000 +0900
++++ b/fs/ext3/xattr.c	2005-08-09 17:58:50.000000000 +0900
 @@ -1025,6 +1025,7 @@
  		if (IS_LAST_ENTRY(entry2))
  			return 1;




More information about the Kernel-svn-changes mailing list