Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 4 Jun 2021 11:28:25 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Jakub Kicinski <kuba@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Pankaj Dubey <pankaj.dubey@samsung.com>,
        Sriranjani P <sriranjani.p@samsung.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20210604112825.011148a3@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/yix.nsB042Is1A_3FID+5_V";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/yix.nsB042Is1A_3FID+5_V
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

between commit:

  593f555fbc60 ("net: stmmac: fix kernel panic due to NULL pointer derefere=
nce of mdio_bus_data")

from the net tree and commit:

  11059740e616 ("net: pcs: xpcs: convert to phylink_pcs_ops")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index c87202cbd3d6,6d41dd6f9f7a..000000000000
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@@ -1240,9 -1222,7 +1222,9 @@@ static int stmmac_phy_setup(struct stmm
  	priv->phylink_config.dev =3D &priv->dev->dev;
  	priv->phylink_config.type =3D PHYLINK_NETDEV;
  	priv->phylink_config.pcs_poll =3D true;
- 	if (priv->plat->mdio_bus_data)
 -	priv->phylink_config.ovr_an_inband =3D mdio_bus_data->xpcs_an_inband;
++	if (mdio_bus_data)
 +		priv->phylink_config.ovr_an_inband =3D
- 			priv->plat->mdio_bus_data->xpcs_an_inband;
++			mdio_bus_data->xpcs_an_inband;
 =20
  	if (!fwnode)
  		fwnode =3D dev_fwnode(priv->device);

--Sig_/yix.nsB042Is1A_3FID+5_V
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmC5gbkACgkQAVBC80lX
0GxvRQgAjaWUMCoJpTNhSdCO7D+O7Y+e/0gVuFglBuB0/rvwirk6auAW7X53m2ss
Ix+dpdwLHB2KfCvsXAGm02UV7wLHZLqAy9VB/UKtwtNS2ssvZUl0+ijeIliZsRlf
CjRojK7eCEIr/sE9qHhZRhbmRF0s9TXiVUepK3dfnNgzBGtckuJFMbLQfSF9YyzC
SVMfuOc74xK54bA0QOYp4K8qc3iWykBQ1kNVA5sngcsZiEXaDHa6EV6RzscLdW1p
ZZLbvoqHt1OJ+PDBcgwfiB+Drf6fAXOovHo0RwwOkRo+SqOm8qf5/amnGsKVW4vA
BI00/fQLlIHZ/L2xXtR4a/i3cezpcg==
=Y+w9
-----END PGP SIGNATURE-----

--Sig_/yix.nsB042Is1A_3FID+5_V--