summaryrefslogtreecommitdiff
path: root/net/kcm/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-11 20:59:43 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-11 20:59:43 -0500
commitdfcb7a14866b8c34b2d3a74ae31631e1d4e7f591 (patch)
treeb7d5175e7c84f0a806b52064b34f1ef0fd780111 /net/kcm/Makefile
parent35eeacf1820a08305c2b0960febfa190f5a6dd63 (diff)
parent235a9d89da976e2975b3de9afc0bed7b72557983 (diff)
Merge branch 'ipvtap'
Sainath Grandhi says: ==================== Refactor macvtap to re-use tap functionality by other virtual intefaces Tap character devices can be implemented on other virtual interfaces like ipvlan, similar to macvtap. Source code for tap functionality in macvtap can be re-used for this purpose. This patch series splits macvtap source into two modules, macvtap and tap. This patch series also includes a patch for implementing tap character device driver based on the IP-VLAN network interface, called ipvtap. These patches are tested on x86 platform. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/kcm/Makefile')
0 files changed, 0 insertions, 0 deletions
3) Do not allow lwtunnel drivers to be unloaded while they are referenced by active instances, from Robert Shearman. 14) Fix truncated PHY LED trigger names, from Geert Uytterhoeven. 15) Fix a few regressions from virtio_net XDP support, from John Fastabend and Jakub Kicinski. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (102 commits) ISDN: eicon: silence misleading array-bounds warning net: phy: micrel: add support for KSZ8795 gtp: fix cross netns recv on gtp socket gtp: clear DF bit on GTP packet tx gtp: add genl family modules alias tcp: don't annotate mark on control socket from tcp_v6_send_response() ravb: unmap descriptors when freeing rings virtio_net: reject XDP programs using header adjustment virtio_net: use dev_kfree_skb for small buffer XDP receive r8152: check rx after napi is enabled r8152: re-schedule napi for tx r8152: avoid start_xmit to schedule napi when napi is disabled r8152: avoid start_xmit to call napi_schedule during autosuspend net: dsa: Bring back device detaching in dsa_slave_suspend() net: phy: leds: Fix truncated LED trigger names net: phy: leds: Break dependency of phy.h on phy_led_triggers.h net: phy: leds: Clear phy_num_led_triggers on failure to avoid crash net-next: ethernet: mediatek: change the compatible string Documentation: devicetree: change the mediatek ethernet compatible string bnxt_en: Fix RTNL lock usage on bnxt_get_port_module_status(). ...
Diffstat (limited to 'fs/nfsd/idmap.h')