Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflict was two parallel additions of include files to sch_generic.c, no biggie. Signed-off-by: David S. Miller <davem@davemloft.net>
2017-12-09 22:09:55 -05:00
parent 5e54b3c120 f335195adf
commit 51e18a453f
753 changed files with 7211 additions and 4566 deletions
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -686,6 +686,7 @@ struct vmbus_channel {
 	u8 monitor_bit;

 	bool rescind; /* got rescind msg */
+	struct completion rescind_event;

 	u32 ringbuffer_gpadlhandle;