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
Date: Tue, 4 Oct 2022 13:27:23 +1100 [thread overview]
Message-ID: <20221004132723.7b4b03ab@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]
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 probe 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.
--
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 = false;
+ err = aperture_remove_conflicting_pci_devices(dev, "tridentfb");
+ if (err)
+ return err;
+
- err = pci_enable_device(dev);
+ err = pcim_enable_device(dev);
if (err)
return err;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-10-04 2:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 2:27 Stephen Rothwell [this message]
2022-10-04 7:29 ` linux-next: manual merge of the fbdev tree with the drm tree Helge Deller
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 2:38 Stephen Rothwell
2023-12-13 0:58 Stephen Rothwell
2023-12-13 0:56 Stephen Rothwell
2023-08-01 0:43 Stephen Rothwell
2023-06-20 1:38 Stephen Rothwell
2022-12-13 0:16 Stephen Rothwell
2022-12-13 11:10 ` Helge Deller
2013-06-17 4:21 Stephen Rothwell
2013-06-17 7:23 ` Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221004132723.7b4b03ab@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@redhat$(echo .)com \
--cc=deller@gmx$(echo .)de \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ruanjinjie@huawei$(echo .)com \
--cc=tzimmermann@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox