8565d26bcb
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> |
||
|---|---|---|
| .. | ||
| peak_usb | ||
| ems_usb.c | ||
| esd_usb2.c | ||
| gs_usb.c | ||
| Kconfig | ||
| kvaser_usb.c | ||
| Makefile | ||
| mcba_usb.c | ||
| usb_8dev.c | ||