- fetch 2.6.36

Changed files:
    kernel-ipvs-nfct.patch -> 1.5
    kernel.spec -> 1.838

diff --git a/kernel-ipvs-nfct.patch b/kernel-ipvs-nfct.patch
index c52ccc45b46c1aa616559eed6c7289e7d92e81d3..d599882cd13b61a20e4ef434facd62aa2142b972 100644 (file)
--- a/kernel-ipvs-nfct.patch
+++ b/kernel-ipvs-nfct.patch
@@ -722,7 +722,7 @@ diff -urNp v2.6.34/linux/net/netfilter/ipvs/ip_vs_xmit.c linux/net/netfilter/ipv
 -
        /* drop old route */
        skb_dst_drop(skb);
-       skb_dst_set(skb, &rt->u.dst);
+       skb_dst_set(skb, &rt->dst);
  
 +      if (!ip_vs_confirm_conntrack(skb, cp, NF_INET_LOCAL_IN))
 +              goto tx_error_out;

diff --git a/kernel.spec b/kernel.spec
index d2a1587b4cbf3f2db33c3d2a8c6262748b171396..a827b8f1a20392052fed11d3966942ec42d8d8eb 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -112,13 +112,13 @@
 %define                have_pcmcia     0
 %endif
 
-%define                basever         2.6.35
-%define                postver         .7
-%define                rel             4
+%define                basever         2.6.36
+%define                postver         %{nil}
+%define                rel             0.1
 
 %define                _enable_debug_packages                  0
 
-%define                tuxonice_version        3.1.1.1
+%define                tuxonice_version        3.2
 %define                netfilter_snap          20070806
 
 %if %{with myown}
@@ -154,7 +154,7 @@ Epoch:              3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
-# Source0-md5: 091abeb4684ce03d1d936851618687b6
+# Source0-md5: 61f3739a73afb6914cb007f37fb09b62
 %if "%{postver}" != "%{nil}"
 Source1:       http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
 # Source1-md5: 6a00ec267b0100f20a3fa900b97a5b7f