upgrade to 2.6.31.7

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18747 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 420bd11..05c3691 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -22,8 +22,8 @@ endif
 ifeq ($(LINUX_VERSION),2.6.30.10)
   LINUX_KERNEL_MD5SUM:=eb6be465f914275967a5602cb33662f5
 endif
 ifeq ($(LINUX_VERSION),2.6.30.10)
   LINUX_KERNEL_MD5SUM:=eb6be465f914275967a5602cb33662f5
 endif

-ifeq ($(LINUX_VERSION),2.6.31.6)
-  LINUX_KERNEL_MD5SUM:=485472df88af84becdcf47f45de3ba46
+ifeq ($(LINUX_VERSION),2.6.31.7)
+  LINUX_KERNEL_MD5SUM:=ae93db04f169f35c98e786f25e84c237

 endif
 ifeq ($(LINUX_VERSION),2.6.32)
   LINUX_KERNEL_MD5SUM:=260551284ac224c3a43c4adac7df4879
 endif
 ifeq ($(LINUX_VERSION),2.6.32)
   LINUX_KERNEL_MD5SUM:=260551284ac224c3a43c4adac7df4879

diff --git a/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
index 70c80c8..cc9f5f2 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
@@ -811,7 +811,7 @@
  extern void kfree_skb(struct sk_buff *skb);
  extern void consume_skb(struct sk_buff *skb);
  extern void          __kfree_skb(struct sk_buff *skb);
  extern void kfree_skb(struct sk_buff *skb);
  extern void consume_skb(struct sk_buff *skb);
  extern void          __kfree_skb(struct sk_buff *skb);

-@@ -1974,6 +1992,10 @@ static inline void __nf_copy(struct sk_b
+@@ -1976,6 +1994,10 @@ static inline void __nf_copy(struct sk_b

        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif
        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif

diff --git a/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
index d9e443a..b90a247 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
@@ -1,6 +1,6 @@
 --- a/init/main.c
 +++ b/init/main.c
 --- a/init/main.c
 +++ b/init/main.c

-@@ -844,7 +844,7 @@ static noinline int init_post(void)
+@@ -839,7 +839,7 @@ static noinline int init_post(void)

        numa_default_policy();
  
        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
        numa_default_policy();
  
        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)

diff --git a/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
index 5d1f61f..c85113d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
@@ -1,6 +1,6 @@
 --- a/init/main.c
 +++ b/init/main.c
 --- a/init/main.c
 +++ b/init/main.c

-@@ -868,10 +868,7 @@ static noinline int init_post(void)
+@@ -863,10 +863,7 @@ static noinline int init_post(void)

                printk(KERN_WARNING "Failed to execute %s.  Attempting "
                                        "defaults...\n", execute_command);
        }
                printk(KERN_WARNING "Failed to execute %s.  Attempting "
                                        "defaults...\n", execute_command);
        }

diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 94a259f..164e279 100644 (file)
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=x86
 FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia tgz
 SUBTARGETS=generic olpc
 
 FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia tgz
 SUBTARGETS=generic olpc
 

-LINUX_VERSION:=2.6.31.6
+LINUX_VERSION:=2.6.31.7

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk