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:   Fri, 28 Oct 2022 08:53:07 +0200
From:   Marc Kleine-Budde <mkl@pengutronix.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Anssi Hannula <anssi.hannula@bitwise.fi>,
        Jimmy Assarsson <extja@kvaser.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree
Message-ID: <20221028065307.hjw64fmzmxduljui@pengutronix.de>
References: <20221028102811.5938f029@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="lxuruu2uz3jgswru"
Content-Disposition: inline
In-Reply-To: <20221028102811.5938f029@canb.auug.org.au>
Precedence: bulk


--lxuruu2uz3jgswru
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On 28.10.2022 10:28:11, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the net-next tree got a conflict in:
>=20
>   drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
>=20
> between commit:
>=20
>   2871edb32f46 ("can: kvaser_usb: Fix possible completions during init_co=
mpletion")
>=20
> from Linus' tree and commit:
>=20
>   abb8670938b2 ("can: kvaser_usb_leaf: Ignore stale bus-off after start")
>=20
> from the net-next tree.
>=20
> 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.

The fix looks good to me!

Thanks,
Marc

--=20
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

--lxuruu2uz3jgswru
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEBsvAIBsPu6mG7thcrX5LkNig010FAmNbfFEACgkQrX5LkNig
010rpwf/UYh9nCCC6/psiwDgpvekVkMedOQ4RCQoMLqWKzJ4U1Nn79Wjouw6qxz0
TPHY/CJcZKaq0fAsfgVLCvttrphCpVqluBMfW0OELARUn4WPEmsR0KftmHZFQaLd
qFpTCl+hoiV1YLKx8aJNJlXIAoeM5hyMxTtAzQ4l6oslkiv5y10AE15Xa/vUhBHm
znknbOGorVEs5x2EcetsFXWhAitSJykrHdhPYhC0BkbmyvG1uzBlUwCREw+BYQdU
pf6YZdsXlRXIzmK8VpIxV9SNmN1AI31nB/8+L8shVIlfG2IWf4PzwaBpnFEKrZAB
AS6+8INKiuhPX+SHD9839LRZPvMosw==
=rIdh
-----END PGP SIGNATURE-----

--lxuruu2uz3jgswru--