Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Date:   Mon, 23 Oct 2023 14:47:20 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Cc:     Networking <netdev@vger.kernel.org>,
        Benjamin Poirier <benjamin.poirier@gmail.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Przemek Kitszel <przemyslaw.kitszel@intel.com>
Subject: linux-next: manual merge of the staging tree with the net-next tree
Message-ID: <20231023144720.231873f1@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/1k0w+OwPEDYvUpmeB8AIS_y";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/1k0w+OwPEDYvUpmeB8AIS_y
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/staging/qlge/qlge_devlink.c

between commit:

  3465915e9985 ("staging: qlge: devlink health: use retained error fmsg API=
")

from the net-next tree and commit:

  875be090928d ("staging: qlge: Retire the driver")

from the staging tree.

I fixed it up (I just deleted 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_/1k0w+OwPEDYvUpmeB8AIS_y
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU17MgACgkQAVBC80lX
0GxEkggAke6CgrGBCpIMbig3gO6i+5vRazhxfigGMdsUJIaAgTtTkmgZy3ziEUO8
zqA/zfUhemkK4MfxzCDnJlSiCB8fM7qkuTf9u8lN3l/Bv+jqIOPySsNFyw+6z01h
PE5ngUL9y1wLl0r2ShhJn9VH6VYeTGcgCMz0g9GlyPvjTDJ5rJkXreS34MF7FbIK
hlPy1KFVwqok/Z1KTFDyuiaJSRTXEtTECsoz4tHOKksRDE5jB0KV1gTl4wB9uFpQ
tbkRYzzXlYuxUSDKhENFsJ1wDky2wRZsJlFQbRjDIoimtwn4xwI3z0SNujpRACI4
n2Qmw+PDVT65lvukobXDl50hX5WGjQ==
=dcuf
-----END PGP SIGNATURE-----

--Sig_/1k0w+OwPEDYvUpmeB8AIS_y--