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

[Stephen Rothwell]

Hi all,

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

  net/switchdev/switchdev.c

between commit:

  20776b465c0c ("net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP")

from Linus' tree and commits:

  ffb68fc58e96 ("net: switchdev: remove the transaction structure from port object notifiers")
  bae33f2b5afe ("net: switchdev: remove the transaction structure from port attributes")

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/switchdev/switchdev.c
index 2c1ffc9ba2eb,855a10feef3d..000000000000
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@@ -460,11 -388,9 +388,10 @@@ static int __switchdev_handle_port_obj_
  	extack = switchdev_notifier_info_to_extack(&port_obj_info->info);
  
  	if (check_cb(dev)) {
- 		err = add_cb(dev, port_obj_info->obj, port_obj_info->trans,
- 			     extack);
 -		/* This flag is only checked if the return value is success. */
 -		port_obj_info->handled = true;
 -		return add_cb(dev, port_obj_info->obj, extack);
++		err = add_cb(dev, port_obj_info->obj, extack);
 +		if (err != -EOPNOTSUPP)
 +			port_obj_info->handled = true;
 +		return err;
  	}
  
  	/* Switch ports might be stacked under e.g. a LAG. Ignore the
@@@ -570,10 -493,8 +495,10 @@@ static int __switchdev_handle_port_attr
  	int err = -EOPNOTSUPP;
  
  	if (check_cb(dev)) {
- 		err = set_cb(dev, port_attr_info->attr, port_attr_info->trans);
 -		port_attr_info->handled = true;
 -		return set_cb(dev, port_attr_info->attr);
++		err = set_cb(dev, port_attr_info->attr);
 +		if (err != -EOPNOTSUPP)
 +			port_attr_info->handled = true;
 +		return err;
  	}
  
  	/* Switch ports might be stacked under e.g. a LAG. Ignore the

Attachment: pgprdxJu_NoSs.pgp
Description: OpenPGP digital signature