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> |
||
|---|---|---|
| .. | ||
| b43_pci_bridge.c | ||
| bridge_pcmcia_80211.c | ||
| driver_chipcommon_pmu.c | ||
| driver_chipcommon_sflash.c | ||
| driver_chipcommon.c | ||
| driver_extif.c | ||
| driver_gige.c | ||
| driver_gpio.c | ||
| driver_mipscore.c | ||
| driver_pcicore.c | ||
| embedded.c | ||
| host_soc.c | ||
| Kconfig | ||
| main.c | ||
| Makefile | ||
| pci.c | ||
| pcihost_wrapper.c | ||
| pcmcia.c | ||
| scan.c | ||
| sdio.c | ||
| sprom.c | ||
| ssb_private.h | ||