Update to 2.6.36.1 and fix one more panic

1 files changed, 6 insertions, 2 deletions

diff --git a/PATCHCFG b/PATCHCFG
index 399359a..2c95d6b 100644
--- a/PATCHCFG
+++ b/PATCHCFG
@@ -10,18 +10,22 @@ SRCNAME="linux-2.6.36-ARCH"
 #   filename%patchlevel (file must be in patches/ subdirectory)
 PATCHES=(
          # add upstream patch from 2.6.36 series
-         #ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.36.1.bz2%1
+         ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.36.1.bz2%1
 
          # add latest fixes from stable queue, if needed
          # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
+         # Apply http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a1c6c5698d53db4c47a25c3a8d11731a4d7b8370
+         # to our kernel to fix a ext4 related panic
+         ext4-fix-NULL-pointer-dereference-in-print_daily_err.patch%1
+
          # add aufs2 support, in reference to:
          # http://aufs.sourceforge.net
          aufs2-base-20101021.patch%1
          aufs2-standalone-20101021.patch%1
         )
 # Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-2.6.36-1-ARCH"
+PATCHNAME="patch-2.6.36.1-1-ARCH"
 
 # Run this before applying patches
 pre_apply() {