diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-17 13:30:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-17 13:30:32 -0400 |
| commit | 92cf1f23cc9390ea5c00e8185c1f7910c3d15452 (patch) | |
| tree | 5efa469a504fa66d2127aeaf607b47b919e298b5 /include/uapi/linux/Kbuild | |
| parent | 98d2f0e68c4de36c56fbe3baeae30c001f012243 (diff) | |
| parent | e0f0ecf33c3f13401f90bff5afdc3ed1bb40b9af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/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>
Diffstat (limited to 'include/uapi/linux/Kbuild')
| -rw-r--r-- | include/uapi/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 7df19052533..ab5d4992e56 100644 --- 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 |