Linus has merged the net-2.6.14 tree from DaveM
This means that all the code from my netfilter-2.6.14 tree (master branch) are now in the mainline kernel. The code in question mainly includes
- conntrack event notifiers
- nfnetlink layer
- ctnetlink interface
- nf_log API extension
- nf_queue and nf_log /proc files
- nfnetlink_log as successor of ipt_ULOG and ebt_ulog
- nfnetlink_queue as successor of ip_queue and ip6_queue
We'll see whether nf_conntrack will also go into 2.6.14, at the moment I have my doubts...