Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
  2871edb32f46 ("can: kvaser_usb: Fix possible completions during init_completion")
  abb8670938b2 ("can: kvaser_usb_leaf: Ignore stale bus-off after start")
  8d21f5927ae6 ("can: kvaser_usb_leaf: Fix improved state not being reported")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/can/rcar/rcar_canfd.c
Simple merge

diff --cc drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
Simple merge

diff --cc drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
index 5225e2da6437e022fb566fb3ebe6b059a94b33a4,19958037720f4544d051e1149abae36021f612bd..1c2f99ce4c6c72832ec5f60b60bb490c2adf7f78
--- 1/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
--- 2/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
@@@ -1632,12 -1318,9 +1632,12 @@@ static int kvaser_usb_leaf_set_opt_mode
  
  static int kvaser_usb_leaf_start_chip(struct kvaser_usb_net_priv *priv)
  {
 +      struct kvaser_usb_net_leaf_priv *leaf = priv->sub_priv;
        int err;
  
-       init_completion(&priv->start_comp);
 +      leaf->joining_bus = true;
 +
+       reinit_completion(&priv->start_comp);
  
        err = kvaser_usb_leaf_send_simple_cmd(priv->dev, CMD_START_CHIP,
                                              priv->channel);
@@@ -1653,13 -1336,10 +1653,13 @@@
  
  static int kvaser_usb_leaf_stop_chip(struct kvaser_usb_net_priv *priv)
  {
 +      struct kvaser_usb_net_leaf_priv *leaf = priv->sub_priv;
        int err;
  
-       init_completion(&priv->stop_comp);
+       reinit_completion(&priv->stop_comp);
  
 +      cancel_delayed_work(&leaf->chip_state_req_work);
 +
        err = kvaser_usb_leaf_send_simple_cmd(priv->dev, CMD_STOP_CHIP,
                                              priv->channel);
        if (err)

diff --cc drivers/net/ethernet/broadcom/bcm4908_enet.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/socionext/sni_ave.c
Simple merge

diff --cc drivers/net/ipa/data/ipa_data-v3.5.1.c
Simple merge

diff --cc drivers/net/ipa/ipa_main.c
Simple merge

diff --cc net/can/j1939/transport.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv6/ip6_gre.c
Simple merge

diff --cc net/mac802154/rx.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/mptcp/subflow.c
Simple merge