mirror of https://gitee.com/openkylin/linux.git
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> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| Makefile | ||
| config | ||
| hwtstamp_config.c | ||
| rxtimestamp.c | ||
| timestamping.c | ||
| txtimestamp.c | ||
| txtimestamp.sh | ||