Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 28 Oct 2022 10:28:11 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Anssi Hannula <anssi.hannula@bitwise.fi>,
        Jimmy Assarsson <extja@kvaser.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Marc Kleine-Budde <mkl@pengutronix.de>
Subject: linux-next: manual merge of the net-next tree with Linus' tree
Message-ID: <20221028102811.5938f029@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/pW=4nL90RBLWfjr45coo/tP";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/pW=4nL90RBLWfjr45coo/tP
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c

between commit:

  2871edb32f46 ("can: kvaser_usb: Fix possible completions during init_comp=
letion")

from Linus' tree and commit:

  abb8670938b2 ("can: kvaser_usb_leaf: Ignore stale bus-off after start")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

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

--Sig_/pW=4nL90RBLWfjr45coo/tP
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmNbFAsACgkQAVBC80lX
0Gy57QgAlO+AdQG1WKqPqWdkLyZqFf82xrI8EJbuveeIgC0Aw5+1042URuSoiKpZ
LtzCkhydPObHPvZiBEIKhnOx3rUaktnGxW0KOUqOkor3QzH3i8cNYklD1LmAYoq7
w9X2/Xph91mDf1RVBBsj7LPg8+u/MHYC50mpNcSrUMRwnaUuvDxNa87VpH4sQQzK
qLSI+BrMgqtHZFWzMuotCz4blkZBeUlRyhI9lNILJcd2ii+VjW5t4XiiylX8kxHU
FEiq6LcT3P3q28/oEgj5Qg2NJAZuUfKuvEI7R1Yj/UzYVwujNzSVIcPEgdMYEZuf
GyHKt4A3rrS//LXpwjl057MKdwU0dQ==
=KNc4
-----END PGP SIGNATURE-----

--Sig_/pW=4nL90RBLWfjr45coo/tP--