2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 23:23:55 +08:00
linux-next/drivers/net/ipvlan
David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-09 16:28:45 -07:00
..
ipvlan_core.c ipvtap: IP-VLAN based tap driver 2017-02-11 20:59:41 -05:00
ipvlan_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-08-09 16:28:45 -07:00
ipvlan.h net: add netlink_ext_ack argument to rtnl_link_ops.newlink 2017-06-26 23:13:21 -04:00
ipvtap.c ipvlan: Stop advertising NETIF_F_UFO support. 2017-07-17 09:52:57 -07:00
Makefile ipvtap: IP-VLAN based tap driver 2017-02-11 20:59:41 -05:00