| commit | 8565d26bcb2ff6df646e946d2913fcf706d46b66 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Jan 19 22:59:33 2018 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Jan 19 22:59:33 2018 -0500 |
| tree | 21ffaccc3cbac5e558d51c20cfbecbfec86a02c4 | |
| parent | 85831e56a1d0c75a1560e61acbb8591e9f11c6b7 [diff] | |
| parent | ec835f8104a21f4d4eeb9d316ee71d2b4a7f00de [diff] |
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>