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

[broonie@xxxxxxxxxx]

Hi all,

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

  drivers/net/dsa/lan9303_i2c.c
  drivers/net/dsa/microchip/ksz9477_i2c.c
  drivers/net/dsa/xrs700x/xrs700x_i2c.c

between commit:

  ed5c2f5fd10dd ("i2c: Make remove callback return void")

from the i2c tree and commits:

  db5d451c4640a ("net: dsa: lan9303: remove unnecessary i2c_set_clientdata()")
  008971adb95d3 ("net: dsa: microchip: ksz9477: remove unnecessary i2c_set_clientdata()")
  6387bf7c390a1 ("net: dsa: xrs700x: remove unnecessary i2c_set_clientdata()")

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.

diff --cc drivers/net/dsa/lan9303_i2c.c
index b25e91b26d991,79be5fc044bd4..0000000000000
--- a/drivers/net/dsa/lan9303_i2c.c
+++ b/drivers/net/dsa/lan9303_i2c.c
@@@ -70,11 -70,11 +70,9 @@@ static void lan9303_i2c_remove(struct i
  	struct lan9303_i2c *sw_dev = i2c_get_clientdata(client);
  
  	if (!sw_dev)
 -		return 0;
 +		return;
  
  	lan9303_remove(&sw_dev->chip);
--
- 	i2c_set_clientdata(client, NULL);
 -	return 0;
  }
  
  static void lan9303_i2c_shutdown(struct i2c_client *client)
diff --cc drivers/net/dsa/microchip/ksz9477_i2c.c
index 4a719ab8aa89c,e111756f64735..0000000000000
--- a/drivers/net/dsa/microchip/ksz9477_i2c.c
+++ b/drivers/net/dsa/microchip/ksz9477_i2c.c
@@@ -58,8 -58,8 +58,6 @@@ static void ksz9477_i2c_remove(struct i
  
  	if (dev)
  		ksz_switch_remove(dev);
--
- 	i2c_set_clientdata(i2c, NULL);
 -	return 0;
  }
  
  static void ksz9477_i2c_shutdown(struct i2c_client *i2c)
diff --cc drivers/net/dsa/xrs700x/xrs700x_i2c.c
index bbaf5a3fbf000,cd533b9e17eca..0000000000000
--- a/drivers/net/dsa/xrs700x/xrs700x_i2c.c
+++ b/drivers/net/dsa/xrs700x/xrs700x_i2c.c
@@@ -110,11 -110,11 +110,9 @@@ static void xrs700x_i2c_remove(struct i
  	struct xrs700x *priv = i2c_get_clientdata(i2c);
  
  	if (!priv)
 -		return 0;
 +		return;
  
  	xrs700x_switch_remove(priv);
--
- 	i2c_set_clientdata(i2c, NULL);
 -	return 0;
  }
  
  static void xrs700x_i2c_shutdown(struct i2c_client *i2c)