netdev - linux-next: manual merge of the net-next tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20221028102811.5938f029@canb.auug.org.au>
Date:   Fri, 28 Oct 2022 10:28:11 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Anssi Hannula <anssi.hannula@...wise.fi>,
        Jimmy Assarsson <extja@...ser.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Marc Kleine-Budde <mkl@...gutronix.de>
Subject: linux-next: manual merge of the net-next tree with Linus' tree

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_completion")

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.

-- 
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
  
  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;
  
+ 	leaf->joining_bus = true;
+ 
 -	init_completion(&priv->start_comp);
 +	reinit_completion(&priv->start_comp);
  
  	err = kvaser_usb_leaf_send_simple_cmd(priv->dev, CMD_START_CHIP,
  					      priv->channel);
@@@ -1336,10 -1653,13 +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)

Content of type "application/pgp-signature" skipped