Messages in this thread | | | Date | Tue, 4 Oct 2022 09:29:12 +0200 | Subject | Re: linux-next: manual merge of the fbdev tree with the drm tree | From | Helge Deller <> |
| |
On 10/4/22 04:27, Stephen Rothwell wrote: > 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.
Thanks for the notice! I'll fix it up in the fbdev tree, either by dropping that offending patch or fix the conflict.
Helge
| |