Re: linux-next: manual merge of the fbdev tree with the drm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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





[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux