r1464 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series
maks-guest@haydn.debian.org
maks-guest@haydn.debian.org
Sun, 29 Aug 2004 03:09:59 -0600
Author: maks-guest
Date: 2004-08-29 03:07:54 -0600 (Sun, 29 Aug 2004)
New Revision: 1464
Added:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/intel-cache-descriptors.dpatch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/netstat-fix-output.dpatch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/reiserfs-xattr.dpatch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
Modified:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
Log:
add one important reiserfs fix, a netstat fix and add some intel descriptors
all included in current upstream
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2004-08-29 02:23:49 UTC (rev 1463)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2004-08-29 09:07:54 UTC (rev 1464)
@@ -1,3 +1,13 @@
+kernel-source-2.6.8 (2.6.8-6) UNRELEASED; urgency=low
+
+ * reiserfs xattr/acl fix if root fs. (Max Attems)
+
+ * fix /proc/net/netstat output for `netstat -s`. (Max Attems)
+
+ * Add missing intel CPU descriptors. (Max Attems)
+
+ --
+
kernel-source-2.6.8 (2.6.8-5) unstable; urgency=high
* Patches by the infintely wise and awesome David S. Miller:
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/intel-cache-descriptors.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/intel-cache-descriptors.dpatch 2004-08-29 02:23:49 UTC (rev 1463)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/intel-cache-descriptors.dpatch 2004-08-29 09:07:54 UTC (rev 1464)
@@ -0,0 +1,28 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Add missing intel CPU descriptors
+## DP: Patch author: Dave Jones, alan@lxorguk.ukuu.org.uk
+## DP: Upstream status: included in 2.6.9-rc1
+
+ . $(dirname $0)/DPATCH
+
+@DPATCH@
+diff -Nru a/arch/i386/kernel/cpu/intel.c b/arch/i386/kernel/cpu/intel.c
+--- a/arch/i386/kernel/cpu/intel.c 2004-08-29 01:52:16 -07:00
++++ b/arch/i386/kernel/cpu/intel.c 2004-08-29 01:52:16 -07:00
+@@ -97,10 +97,13 @@
+ { 0x70, LVL_TRACE, 12 },
+ { 0x71, LVL_TRACE, 16 },
+ { 0x72, LVL_TRACE, 32 },
++ { 0x78, LVL_2, 1024 },
+ { 0x79, LVL_2, 128 },
+ { 0x7a, LVL_2, 256 },
+ { 0x7b, LVL_2, 512 },
+ { 0x7c, LVL_2, 1024 },
++ { 0x7d, LVL_2, 2048 },
++ { 0x7f, LVL_2, 512 },
+ { 0x82, LVL_2, 256 },
+ { 0x83, LVL_2, 512 },
+ { 0x84, LVL_2, 1024 },
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/netstat-fix-output.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/netstat-fix-output.dpatch 2004-08-29 02:23:49 UTC (rev 1463)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/netstat-fix-output.dpatch 2004-08-29 09:07:54 UTC (rev 1464)
@@ -0,0 +1,23 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: fix /proc/net/netstat output for `netstat -s`
+## DP: Patch author: cp@absolutedigital.net
+## DP: Upstream status: included in 2.6.9-rc1
+
+ . $(dirname $0)/DPATCH
+
+@DPATCH@
+diff -Nru a/net/ipv4/proc.c b/net/ipv4/proc.c
+--- a/net/ipv4/proc.c 2004-08-29 01:48:27 -07:00
++++ b/net/ipv4/proc.c 2004-08-29 01:48:27 -07:00
+@@ -330,7 +330,7 @@
+ {
+ int i;
+
+- seq_puts(seq, "\nTcpExt:");
++ seq_puts(seq, "TcpExt:");
+ for (i = 0; snmp4_net_list[i].name != NULL; i++)
+ seq_printf(seq, " %s", snmp4_net_list[i].name);
+
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/reiserfs-xattr.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/reiserfs-xattr.dpatch 2004-08-29 02:23:49 UTC (rev 1463)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/reiserfs-xattr.dpatch 2004-08-29 09:07:54 UTC (rev 1464)
@@ -0,0 +1,58 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: reiserfs: xattr/acl fixes bug if filesystem root
+## DP: Patch author: jeffm@suse.com
+## DP: Upstream status: included in 2.6.9-rc1
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+diff -Nru a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
+--- a/fs/reiserfs/xattr.c 2004-08-29 01:41:33 -07:00
++++ b/fs/reiserfs/xattr.c 2004-08-29 01:41:33 -07:00
+@@ -761,6 +761,11 @@
+ err = __reiserfs_xattr_del (dir, name, strlen (name));
+ dput (dir);
+
++ if (!err) {
++ inode->i_ctime = CURRENT_TIME;
++ mark_inode_dirty (inode);
++ }
++
+ out:
+ return err;
+ }
+@@ -1240,8 +1245,10 @@
+ name->hash == priv_root->d_name.hash &&
+ !memcmp (name->name, priv_root->d_name.name, name->len)) {
+ return -ENOENT;
+- }
+- return 0;
++ } else if (q1->len == name->len &&
++ !memcmp(q1->name, name->name, name->len))
++ return 0;
++ return 1;
+ }
+
+ static struct dentry_operations xattr_lookup_poison_ops = {
+diff -Nru a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c
+--- a/fs/reiserfs/xattr_acl.c 2004-08-29 01:41:33 -07:00
++++ b/fs/reiserfs/xattr_acl.c 2004-08-29 01:41:33 -07:00
+@@ -289,8 +289,14 @@
+ error = reiserfs_xattr_set(inode, name, value, size, 0);
+ } else {
+ error = reiserfs_xattr_del (inode, name);
+- if (error == -ENODATA)
++ if (error == -ENODATA) {
++ /* This may seem odd here, but it means that the ACL was set
++ * with a value representable with mode bits. If there was
++ * an ACL before, reiserfs_xattr_del already dirtied the inode.
++ */
++ mark_inode_dirty (inode);
+ error = 0;
++ }
+ }
+
+ if (value)
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6 2004-08-29 02:23:49 UTC (rev 1463)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6 2004-08-29 09:07:54 UTC (rev 1464)
@@ -0,0 +1,3 @@
++ reiserfs-xattr.dpatch
++ netstat-fix-output.dpatch
++ intel-cache-descriptors.dpatch