diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-01-19 22:59:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-19 22:59:33 -0500 |
| commit | 8565d26bcb2ff6df646e946d2913fcf706d46b66 (patch) | |
| tree | 21ffaccc3cbac5e558d51c20cfbecbfec86a02c4 /ipc | |
| parent | Merge branch 'dsa-mv88e6xxx-ATU-VTU-irq-fixes' (diff) | |
| parent | Merge tag 'trace-v4.15-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| download | linux-dev-8565d26bcb2ff6df646e946d2913fcf706d46b66.tar.xz linux-dev-8565d26bcb2ff6df646e946d2913fcf706d46b66.zip | |
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>
Diffstat (limited to 'ipc')
0 files changed, 0 insertions, 0 deletions