[kernel] r15816 - in dists/sid/linux-2.6/debian: . patches/features/all/xen patches/series

[Bastian Blank]

Author: waldi
Date: Mon May 31 21:22:40 2010
New Revision: 15816

Log:
* debian/changelog: Update.
* debian/patches/series/14-extra: Add patch
* debian/patches/features/all/xen/pvops-update.patch: Fix crash in netback.

Added:
   dists/sid/linux-2.6/debian/patches/features/all/xen/pvops-update.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/14-extra

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon May 31 17:59:54 2010	(r15815)
+++ dists/sid/linux-2.6/debian/changelog	Mon May 31 21:22:40 2010	(r15816)
@@ -4,6 +4,9 @@
   * [hppa] Ignore ABI change caused by disabling CONFIG_IDE_TIMINGS
   * [powerpc] Fix unnecessary ABI change
 
+  [ Bastian Blank ]
+  * xen: Fix crash in netback.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 31 May 2010 18:46:34 +0100
 
 linux-2.6 (2.6.32-14) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/features/all/xen/pvops-update.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvops-update.patch	Mon May 31 21:22:40 2010	(r15816)
@@ -0,0 +1,21 @@
+diff --git a/drivers/xen/netback/xenbus.c b/drivers/xen/netback/xenbus.c
+index 70636d0..88262bb 100644
+--- a/drivers/xen/netback/xenbus.c
++++ b/drivers/xen/netback/xenbus.c
+@@ -163,7 +163,6 @@ fail:
+ static int netback_uevent(struct xenbus_device *xdev, struct kobj_uevent_env *env)
+ {
+ 	struct backend_info *be = dev_get_drvdata(&xdev->dev);
+-	struct xen_netif *netif = be->netif;
+ 	char *val;
+ 
+ 	DPRINTK("netback_uevent");
+@@ -182,7 +181,7 @@ static int netback_uevent(struct xenbus_device *xdev, struct kobj_uevent_env *en
+ 		kfree(val);
+ 	}
+ 
+-	if (add_uevent_var(env, "vif=%s", netif->dev->name))
++	if (be && be->netif && add_uevent_var(env, "vif=%s", be->netif->dev->name))
+ 		return -ENOMEM;
+ 
+ 	return 0;

Modified: dists/sid/linux-2.6/debian/patches/series/14-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/14-extra	Mon May 31 17:59:54 2010	(r15815)
+++ dists/sid/linux-2.6/debian/patches/series/14-extra	Mon May 31 21:22:40 2010	(r15816)
@@ -1 +1,2 @@
 + features/all/openvz/revert-cgroup-lite-add-cgroup-id-for-blk-cgroups.patch featureset=openvz
++ features/all/xen/pvops-update.patch featureset=xen