forked from mirrors/linux
3313da8188
The netfilter conflicts were rather simple overlapping changes. However, the cls_tcindex.c stuff was a bit more complex. On the 'net' side, Cong is fixing several races and memory leaks. Whilst on the 'net-next' side we have Vlad adding the rtnl-ness support. What I've decided to do, in order to resolve this, is revert the conversion over to using a workqueue that Cong did, bringing us back to pure RCU. I did it this way because I believe that either Cong's races don't apply with have Vlad did things, or Cong will have to implement the race fix slightly differently. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| falcon | ||
| bitfield.h | ||
| ef10.c | ||
| ef10_regs.h | ||
| ef10_sriov.c | ||
| ef10_sriov.h | ||
| efx.c | ||
| efx.h | ||
| enum.h | ||
| ethtool.c | ||
| farch.c | ||
| farch_regs.h | ||
| filter.h | ||
| io.h | ||
| Kconfig | ||
| Makefile | ||
| mcdi.c | ||
| mcdi.h | ||
| mcdi_mon.c | ||
| mcdi_pcol.h | ||
| mcdi_port.c | ||
| mtd.c | ||
| net_driver.h | ||
| nic.c | ||
| nic.h | ||
| ptp.c | ||
| rx.c | ||
| selftest.c | ||
| selftest.h | ||
| siena.c | ||
| siena_sriov.c | ||
| siena_sriov.h | ||
| sriov.c | ||
| sriov.h | ||
| tx.c | ||
| tx.h | ||
| tx_tso.c | ||
| vfdi.h | ||
| workarounds.h | ||