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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 22 Oct 2021 10:19:39 +1100

Hi all,

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

  drivers/net/ethernet/intel/ice/ice_devids.h

between commit:

  7dcf78b870be ("ice: Add missing E810 device ids")

from the net tree and commit:

  885fe6932a11 ("ice: Add support for SMA control multiplexer")

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/ethernet/intel/ice/ice_devids.h
index ef4392e6e244,8d2c39ee775b..000000000000
--- a/drivers/net/ethernet/intel/ice/ice_devids.h
+++ b/drivers/net/ethernet/intel/ice/ice_devids.h
@@@ -21,10 -21,8 +21,12 @@@
  #define ICE_DEV_ID_E810C_QSFP		0x1592
  /* Intel(R) Ethernet Controller E810-C for SFP */
  #define ICE_DEV_ID_E810C_SFP		0x1593
+ #define ICE_SUBDEV_ID_E810T		0x000E
+ #define ICE_SUBDEV_ID_E810T2		0x000F
 +/* Intel(R) Ethernet Controller E810-XXV for backplane */
 +#define ICE_DEV_ID_E810_XXV_BACKPLANE	0x1599
 +/* Intel(R) Ethernet Controller E810-XXV for QSFP */
 +#define ICE_DEV_ID_E810_XXV_QSFP	0x159A
  /* Intel(R) Ethernet Controller E810-XXV for SFP */
  #define ICE_DEV_ID_E810_XXV_SFP		0x159B
  /* Intel(R) Ethernet Connection E823-C for backplane */