David S. Miller 8565d26bcb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The BPF verifier conflict was some minor contextual issue.

The TUN conflict was less trivial.  Cong Wang fixed a memory leak of
tfile->tx_array in 'net'.  This is an skb_array.  But meanwhile in
net-next tun changed tfile->tx_arry into tfile->tx_ring which is a
ptr_ring.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-19 22:59:33 -05:00
..
2017-05-21 13:42:36 -04:00
2018-01-19 14:17:44 -05:00
2016-12-25 17:21:23 +01:00
2018-01-16 15:01:33 -05:00
2017-09-01 18:35:23 -07:00
2017-11-30 10:25:41 -05:00
2015-11-03 10:52:13 -05:00
2018-01-16 15:01:33 -05:00