| commit | a7c09ae63d1a3d623e6c96bc29be2bb3eca47e42 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Dec 22 14:54:13 2015 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Dec 22 14:54:13 2015 -0500 |
| tree | 894434b0b5d9ca56c1a39a994ffd6f9a1a20119a | |
| parent | 987aaad93a4cc217b84d6caa115bffdc0959eb46 [diff] | |
| parent | d5f79b6e4d169039903cc869e16e59ad861dd479 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains two netfilter fixes: 1) Oneliner from Florian to dump missing NFT_CT_L3PROTOCOL netlink attribute, from Florian Westphal. 2) Another oneliner for nf_tables to use skb->protocol from the new netdev family, we can't assume ethernet there. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>