Author: arekm Date: Mon Mar 15 21:34:22 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.6.33.1
---- Files affected:
packages/kernel:
kernel-imq.patch (1.7 -> 1.8) , kernel.spec (1.774 -> 1.775)
---- Diffs:
================================================================
Index: packages/kernel/kernel-imq.patch
diff -u packages/kernel/kernel-imq.patch:1.7
packages/kernel/kernel-imq.patch:1.8
--- packages/kernel/kernel-imq.patch:1.7 Sat Mar 6 21:31:07 2010
+++ packages/kernel/kernel-imq.patch Mon Mar 15 22:34:16 2010
@@ -876,20 +876,16 @@
#define CHECKSUM_NONE 0
#define CHECKSUM_UNNECESSARY 1
#define CHECKSUM_COMPLETE 2
-@@ -328,10 +331,13 @@
- * layer. Please put your private variables there. If you
- * want to keep them across layers you have to do a skb_clone()
+@@ -330,6 +330,9 @@
* first. This is owned by whoever has the skb queued ATM.
*/
- char cb[48];
+ char cb[48] __aligned(8);
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ void *cb_next;
+#endif
- unsigned int len,
- data_len;
- __u16 mac_len,
- hdr_len;
+ unsigned long _skb_dst;
+ #ifdef CONFIG_XFRM
@@ -360,10 +366,13 @@
void (*destructor)(struct sk_buff *skb);
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.774 packages/kernel/kernel.spec:1.775
--- packages/kernel/kernel.spec:1.774 Sat Mar 13 23:38:01 2010
+++ packages/kernel/kernel.spec Mon Mar 15 22:34:16 2010
@@ -115,8 +115,8 @@
%endif
%define basever 2.6.33
-%define postver %{nil}
-%define rel 0.3
+%define postver .1
+%define rel 1
%define _enable_debug_packages 0
@@ -159,7 +159,7 @@
# Source0-md5: c3883760b18d50e8d78819c54d579b00
%if "%{postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: 7f615dd3b4a3b19fb86e479996a2deb5
+# Source1-md5: 745fd1355c630e163e40c40d4c9b79f9
%endif
Source3: kernel-autoconf.h
@@ -1593,6 +1593,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.775 2010/03/15 21:34:16 arekm
+- up to 2.6.33.1
+
Revision 1.774 2010/03/13 22:38:01 arekm
- bump macros to 1.550
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-imq.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.774&r2=1.775&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
