- updated to 2.6.37.2

- TODO: grsecurity (lots of already applied hunks)

Changed files:
    kernel-small_fixes.patch -> 1.20
    kernel-vserver-2.3.patch -> 1.56
    kernel.spec -> 1.883

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 7dd1fd963804073017412efc36400d0aa959e13a..0387f62b471e54dde8c48e37eacfde11cd2f3cf0 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -116,31 +116,6 @@ index 2494842..edf37aa 100644
        /* block receiver */
        sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
  }
-
-Commit 368e136 ("xfs: remove duplicate code from dquot reclaim") fails
-to unlock the dquot freelist when the number of loop restarts is
-exceeded in xfs_qm_dqreclaim_one(). This causes hangs in memory
-reclaim. Remove the bogus loop exit check that causes the problem.
-
-Reported-by: Malcolm Scott <lkml@malc.org.uk>
-Signed-off-by: Dave Chinner <dchinner@redhat.com>
----
- fs/xfs/quota/xfs_qm.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
-index f8e854b..9431c56 100644
---- a/fs/xfs/quota/xfs_qm.c
-+++ b/fs/xfs/quota/xfs_qm.c
-@@ -1992,8 +1992,6 @@ dqfunlock:
-               xfs_dqunlock(dqp);
-               if (dqpout)
-                       break;
--              if (restarts >= XFS_QM_RECLAIM_MAX_RESTARTS)
--                      return NULL;
-       }
-       mutex_unlock(&xfs_Gqm->qm_dqfrlist_lock);
-       return dqpout;
 Subject: [PATCH -mm] swiotlb: fix wrong panic
 From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 3f154f8f1eea64d70f1814484d65094c5c52b6a6..0d58b165707b935a03ccdbb5dedf66ea9d9f688f 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -6765,9 +6765,9 @@ diff -NurpP --minimal linux-2.6.37/fs/proc/array.c linux-2.6.37-vs2.3.0.37-rc3/f
        task_cpus_allowed(m, task);
        cpuset_task_status_allowed(m, task);
 +      task_vs_id(m, task);
- #if defined(CONFIG_S390)
-       task_show_regs(m, task);
- #endif
+       task_context_switch_counts(m, task);
+       return 0;
+ }
 @@ -465,6 +508,17 @@ static int do_task_stat(struct seq_file 
        /* convert nsec -> ticks */
        start_time = nsec_to_clock_t(start_time);

diff --git a/kernel.spec b/kernel.spec
index bddbf08388d7593515ff037ca56f83a441877544..1216b08c1175e7c351490228a1860c4210635f8d 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -92,8 +92,8 @@
 %endif
 
 %define                basever         2.6.37
-%define                postver         .1
-%define                rel             1
+%define                postver         .2
+%define                rel             0.1
 
 %define                _enable_debug_packages                  0
 
@@ -136,7 +136,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
 # Source0-md5: c8ee37b4fdccdb651e0603d35350b434
 %if "%{postver}" != "%{nil}"
 Source1:       http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: 7693d1d32ed39346cc988e0f027e5890
+# Source1-md5: bb5798f2a2a5af13219d1a250c4dad11
 %endif
 
 Source3:       kernel-autoconf.h