diff options
| author | David S. Miller | 2016-05-15 19:32:12 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-05-15 19:32:48 +0200 |
| commit | 909b27f706433a0b3dff79aa259de63aafe40a42 (patch) | |
| tree | c13cda633379cdbef701e730027b6a19ba6b267e /drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | |
| parent | net: switchdev: Drop EXPERIMENTAL from description (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-909b27f706433a0b3dff79aa259de63aafe40a42.tar.gz kernel-qcow2-linux-909b27f706433a0b3dff79aa259de63aafe40a42.tar.xz kernel-qcow2-linux-909b27f706433a0b3dff79aa259de63aafe40a42.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c')
0 files changed, 0 insertions, 0 deletions