| commit | 909b27f706433a0b3dff79aa259de63aafe40a42 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun May 15 13:32:12 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sun May 15 13:32:48 2016 -0400 |
| tree | c13cda633379cdbef701e730027b6a19ba6b267e | |
| parent | 8fbb89c6fbfd1cda9ae413cd1e042837a8edbdeb [diff] | |
| parent | 272911b889f47aa5bc3e004804fc2382f0ac6ce6 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next' because we no longer have a per-netns conntrack hash. The ip_gre.c conflict as well as the iwlwifi ones were cases of overlapping changes. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/tx.c net/ipv4/ip_gre.c net/netfilter/nf_conntrack_core.c Signed-off-by: David S. Miller <davem@davemloft.net>