Hi all,

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

  drivers/net/mdio/mdio-realtek-rtl9300.c

between commit:

  89a8a1eef2d44 ("net: mdio: realtek-rtl9300: fix RTL931x C22 extended page selection")

from the net tree and commit:

  cc3cb8db1eef9 ("net: mdio: realtek-rtl9300: Add page tracking")

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/mdio/mdio-realtek-rtl9300.c
index 9ce2b78075320,11d078ef941cd..0000000000000
--- a/drivers/net/mdio/mdio-realtek-rtl9300.c
+++ b/drivers/net/mdio/mdio-realtek-rtl9300.c
@@@ -326,9 -567,7 +569,9 @@@ static int otto_emdio_9310_read_c22(str
  	struct otto_emdio_cmd_regs cmd_data = {
  		.broadcast	= FIELD_PREP(RTL9310_BC_PORT_ID, port),
  		.c22_data	= FIELD_PREP(RTL9310_PHY_CTRL_REG_ADDR, regnum) |
- 				  FIELD_PREP(RTL9310_PHY_CTRL_MAIN_PAGE, RAW_PAGE(priv)),
+ 				  FIELD_PREP(RTL9310_PHY_CTRL_MAIN_PAGE, priv->page[port]),
 +		.ext_page	= FIELD_PREP(RTL9310_SMI_INDRT_EXT_PAGE,
 +					     RTL9310_SMI_INDRT_EXT_PAGE_NO_CHANGE),
  	};
  
  	return otto_emdio_read_cmd(bus, RTL9310_PHY_CTRL_TYPE_C22, &cmd_data,
@@@ -340,9 -579,7 +583,9 @@@ static int otto_emdio_9310_write_c22(st
  	struct otto_emdio_priv *priv = otto_emdio_bus_to_priv(bus);
  	struct otto_emdio_cmd_regs cmd_data = {
  		.c22_data	= FIELD_PREP(RTL9310_PHY_CTRL_REG_ADDR, regnum) |
- 				  FIELD_PREP(RTL9310_PHY_CTRL_MAIN_PAGE, RAW_PAGE(priv)),
+ 				  FIELD_PREP(RTL9310_PHY_CTRL_MAIN_PAGE, priv->page[port]),
 +		.ext_page	= FIELD_PREP(RTL9310_SMI_INDRT_EXT_PAGE,
 +					     RTL9310_SMI_INDRT_EXT_PAGE_NO_CHANGE),
  		.io_data	= FIELD_PREP(RTL9310_PHY_CTRL_INDATA, value),
  		.port_mask_high	= (u32)(BIT_ULL(port) >> 32),
  		.port_mask_low	= (u32)(BIT_ULL(port)),