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, 24 Jul 2020 12:23:39 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alex Marginean <alexandru.marginean@nxp.com>,
        Michael Walle <michael@walle.cc>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20200724122339.7abaf0e9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/EGZA=/AkJi0fr0zl4/ATvu/";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/EGZA=/AkJi0fr0zl4/ATvu/
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/freescale/enetc/enetc_pf.c

between commit:

  26cb7085c898 ("enetc: Remove the mdio bus on PF probe bailout")

from the net tree and commits:

  07095c025ac2 ("net: enetc: Use DT protocol information to set up the port=
s")
  c6dd6488acd1 ("enetc: Remove the imdio bus on PF probe bailout")

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

--Sig_/EGZA=/AkJi0fr0zl4/ATvu/
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8aRisACgkQAVBC80lX
0GzPnggApnPI6idjigVTb3u7DyKeLobDIPoAl9w2ymwXZVKsPVjyFgg5ZWzNGQ4W
qtAfbYne78uWNTVeZ80MEbf44qWamM9HTv/7uADKdniPl6poTkC3/iAwRVsFe82n
GOJDNTSf/oaLXavuQu5DiM6JLknBaakIhZS7vP+7PVQBpH8IhopFzB/mwEI27Il1
fqNnbbJKUAUitAk2tAIOKLxY8DW+LtUIrecvjJmhx1DHZiPCSA/M+8pRDwfUR1O6
aE3UeoDfShj0MEuZ3DPc9WqenbQr4HyRWGIpuDe7PO0xLWlGDCbkKX5B4+fF4UVQ
D5EXaKZFdkQDRILpxqHYQQC2NGQ7tg==
=B/2n
-----END PGP SIGNATURE-----

--Sig_/EGZA=/AkJi0fr0zl4/ATvu/--