Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/jesse/openvswitch Jesse Gross says: ==================== A number of improvements for net-next/3.10. Highlights include: * Properly exposing linux/openvswitch.h to userspace after the uapi changes. * Simplification of locking. It immediately makes things simpler to reason about and avoids holding RTNL mutex for longer than necessary. In the near future it will also enable tunnel registration and more fine-grained locking. * Miscellaneous cleanups and simplifications. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
git-mirror · Apr 17, 2013 · 92cf1f2 · 92cf1f2
2 parents 98d2f0e + e0f0ecf
commit 92cf1f2
Show file tree

Hide file tree

Showing 12 changed files with 849 additions and 695 deletions.
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
@@ -285,6 +285,7 @@ header-y += nvram.h
 header-y += omap3isp.h
 header-y += omapfb.h
 header-y += oom.h
+header-y += openvswitch.h
 header-y += packet_diag.h
 header-y += param.h
 header-y += parport.h