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-04-03 19:09:40 -07:00
2017-04-03 19:09:40 -07:00
2017-04-25 10:08:16 -04:00
2017-04-03 19:09:40 -07:00
2017-06-16 11:48:40 -04:00
2017-04-25 10:08:16 -04:00
2017-04-03 19:09:40 -07:00
2017-06-16 11:48:40 -04:00