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:   Tue, 4 Oct 2022 13:27:23 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Helge Deller <deller@gmx.de>, Dave Airlie <airlied@redhat.com>
Cc:     DRI <dri-devel@lists.freedesktop.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        ruanjinjie <ruanjinjie@huawei.com>
Subject: linux-next: manual merge of the fbdev tree with the drm tree
Message-ID: <20221004132723.7b4b03ab@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/VgRbDH8A3MIwgyQlb3jQMV2";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/VgRbDH8A3MIwgyQlb3jQMV2
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/video/fbdev/tridentfb.c

between commit:

  145eed48de27 ("fbdev: Remove conflicting devices on PCI bus")

from the drm tree and commit:

  d738bf0123d6 ("fbdev: tridentfb: Fix missing pci_disable_device() in prob=
e and remove")

from the fbdev 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/video/fbdev/tridentfb.c
index f9c3b1d38fc2,4d08f4489a0a..000000000000
--- a/drivers/video/fbdev/tridentfb.c
+++ b/drivers/video/fbdev/tridentfb.c
@@@ -1471,11 -1465,7 +1466,11 @@@ static int trident_pci_probe(struct pci
  	int chip_id;
  	bool found =3D false;
 =20
 +	err =3D aperture_remove_conflicting_pci_devices(dev, "tridentfb");
 +	if (err)
 +		return err;
 +
- 	err =3D pci_enable_device(dev);
+ 	err =3D pcim_enable_device(dev);
  	if (err)
  		return err;
 =20

--Sig_/VgRbDH8A3MIwgyQlb3jQMV2
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmM7mgsACgkQAVBC80lX
0Gy6ugf/Ra0OpZea4BrirYbeQMKVFj6mXAHmqwPdQKYSR090tudEKLpUtOuGOoRY
/GLZpXfRSdycbLe1fIBVr79/XYO6rKUgGMzhEcL+4IX8GXkC4J1Mlbmg+adY6JtZ
sNwUq9Ytt98cGcJtDYk/VfdGwHxBPOj/PNjzp4/dFzHZVBHHentk66AqRUTu+7Vn
nPgqBsDK+NZ7N4/R154KMmp0R8bmA24p0I+2qzBlt4xZrWFQlsnk7Jp2ovowCh0/
1SwEkjQtdXGnB6J8aMOAkPwYoMSMTQtTdjan5C8i8jMOI+jhsgqjm8by5iyP11ZH
LHSnaSmGhln4a3tOYkOzochLJ94CBQ==
=wRzP
-----END PGP SIGNATURE-----

--Sig_/VgRbDH8A3MIwgyQlb3jQMV2--