packages (LINUX_3_2): kernel/kernel-vserver-2.3.patch, kernel/kernel.spec -...

[arekm]

Author: arekm                        Date: Mon Mar 19 16:43:48 2012 GMT
Module: packages                      Tag: LINUX_3_2
---- Log message:
- up to 3.2.12

---- Files affected:
packages/kernel:
   kernel-vserver-2.3.patch (1.92 -> 1.92.2.1) , kernel.spec (1.1029 -> 1.1029.2.1) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.92 packages/kernel/kernel-vserver-2.3.patch:1.92.2.1
--- packages/kernel/kernel-vserver-2.3.patch:1.92	Fri Mar 16 10:16:07 2012
+++ packages/kernel/kernel-vserver-2.3.patch	Mon Mar 19 17:43:42 2012
@@ -24143,12 +24143,12 @@
 @@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
  	ip6h->hop_limit = 1;
  	ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
- 	ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
--			   &ip6h->saddr);
-+			   &ip6h->saddr, NULL);
- 	ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
- 
- 	hopopt = (u8 *)(ip6h + 1);
+ 	if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
+-			       &ip6h->saddr)) {
++			       &ip6h->saddr, NULL)) {
+ 		kfree_skb(skb);
+ 		return NULL;
+ 	}
 diff -NurpP --minimal linux-3.2.11/net/core/dev.c linux-3.2.11-vs2.3.2.8/net/core/dev.c
 --- linux-3.2.11/net/core/dev.c	2012-03-14 10:22:15.000000000 +0100
 +++ linux-3.2.11-vs2.3.2.8/net/core/dev.c	2012-03-01 21:39:38.000000000 +0100

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.1029 packages/kernel/kernel.spec:1.1029.2.1
--- packages/kernel/kernel.spec:1.1029	Fri Mar 16 10:16:07 2012
+++ packages/kernel/kernel.spec	Mon Mar 19 17:43:42 2012
@@ -91,9 +91,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		2
+%define		rel		1
 %define		basever		3.2
-%define		postver		.11
+%define		postver		.12
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -136,7 +136,7 @@
 # Source0-md5:	364066fa18767ec0ae5f4e4abcf9dc51
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:	a4c2531ee383dfd429e105816b4d2ccc
+# Patch0-md5:	377a6d731cd246aaa0c0f6a432b7aece
 %endif
 
 Source3:	kernel-autoconf.h
@@ -1515,6 +1515,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1029.2.1  2012/03/19 16:43:42  arekm
+- up to 3.2.12
+
 Revision 1.1029  2012/03/16 09:16:07  arekm
 - rel 2; update vserver patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.92&r2=1.92.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.1029&r2=1.1029.2.1&f=u