linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

Hi all,

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

  net/can/isotp.c

between commit:

  8d0caedb7596 ("can: bcm/raw/isotp: use per module netdevice notifier")

from the net tree and commit:

  6a5ddae57884 ("can: isotp: add symbolic error message to isotp_module_init()")

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 net/can/isotp.c
index be6183f8ca11,f995eaef5d7b..000000000000
--- a/net/can/isotp.c
+++ b/net/can/isotp.c
@@@ -1482,9 -1452,7 +1484,9 @@@ static __init int isotp_module_init(voi
  
  	err = can_proto_register(&isotp_can_proto);
  	if (err < 0)
- 		pr_err("can: registration of isotp protocol failed\n");
+ 		pr_err("can: registration of isotp protocol failed %pe\n", ERR_PTR(err));
 +	else
 +		register_netdevice_notifier(&canisotp_notifier);
  
  	return err;
  }

Attachment: pgp97386XwS9F.pgp
Description: OpenPGP digital signature