Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 10 Nov 2022 10:25:09 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Marc Kleine-Budde <mkl@pengutronix.de>,
        Oliver Hartkopp <socketcan@hartkopp.net>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20221110102509.1f7d63cc@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/URFtFf22l.+X3Y1NFfBS6RV";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/URFtFf22l.+X3Y1NFfBS6RV
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/can/pch_can.c

between commit:

  ae64438be192 ("can: dev: fix skb drop check")

from the net tree and commit:

  1dd1b521be85 ("can: remove obsolete PCH CAN driver")

from the net-next tree.

I fixed it up (I just removed the file) 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_/URFtFf22l.+X3Y1NFfBS6RV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmNsNtUACgkQAVBC80lX
0GxFswf/djufZrRbLl+gPNoti1zVqCMOm95cWuWOTr6tAnsoYYCAdEKRdc9EK8hn
DvKNQghwe4DhpoRc3UvloA+ad0Iw5UATxMghWgXzVpJKD6KID+XDZwzy32ZqrCRk
xf/JCQgHEwVKuihfW1ryM6hpcMSz8s1OgBBxJyEzsiiJI33CJC0ylKi1177ws47o
2ErVgqkWS0zukPReWCUQbGv+ke0LafnR2uyPp+blqATaaqeSo/BlrvrFqvxKSHiG
nbIdZWmUjsnAmzwmM5+k/uJDHb4lVpuYO4sQWKS+k6Bsm80MPl07XdpJK4VS4ANI
qe6khrMbsB3aZACwMi9t0r51cdS4qA==
=rE2s
-----END PGP SIGNATURE-----

--Sig_/URFtFf22l.+X3Y1NFfBS6RV--