]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 15 Feb 2019 20:38:38 +0000 (12:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Feb 2019 20:38:38 +0000 (12:38 -0800)
commit2283044b1f37f94eb7729b62898919d7ef353189
tree5697cd985220def9bc2e35dfbb832dad04c2d051
parent30e91203ed6c42fc27bdfece797ae1d29b5678f5
parent6137a8650dacd1fe24fae29517ae94caab0cccbd
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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>
29 files changed:
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
drivers/net/Kconfig
drivers/net/dsa/bcm_sf2.c
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/ethernet/sfc/ef10.c
drivers/net/phy/phy.c
drivers/net/phy/phylink.c
drivers/net/phy/sfp.c
drivers/net/vxlan.c
include/linux/phy.h
include/net/sock.h
net/batman-adv/soft-interface.c
net/core/sock.c
net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
net/ipv4/route.c
net/ipv6/addrconf.c
net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
net/mac80211/agg-tx.c
net/netfilter/ipvs/ip_vs_core.c
net/sched/cls_tcindex.c
net/sched/sch_generic.c
net/smc/smc_cdc.c
net/smc/smc_cdc.h
net/tipc/link.c
net/wireless/nl80211.c