diff --git a/[refs] b/[refs]
index ca8d10e43939..83e4b398e32a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 268eff909afaca93188d2d14554cbf824f6a0e41
+refs/heads/master: d70c673153d42e8aefd5ac296c8159ef222d076b
diff --git a/trunk/drivers/staging/hv/netvsc.c b/trunk/drivers/staging/hv/netvsc.c
index df9cd131e953..0edbe7483a4c 100644
--- a/trunk/drivers/staging/hv/netvsc.c
+++ b/trunk/drivers/staging/hv/netvsc.c
@@ -1279,7 +1279,7 @@ static void netvsc_channel_cb(void *context)
 	/* ASSERT(device); */
 
 	packet = kzalloc(NETVSC_PACKET_SIZE * sizeof(unsigned char),
-			 GFP_KERNEL);
+			 GFP_ATOMIC);
 	if (!packet)
 		return;
 	buffer = packet;