[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <9e45b60b-4af5-4fed-7b7d-3a5c4dcd6321@gmx.de>
Date: Tue, 4 Oct 2022 09:29:12 +0200
From: Helge Deller <deller@....de>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
Dave Airlie <airlied@...hat.com>
Cc: DRI <dri-devel@...ts.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
Thomas Zimmermann <tzimmermann@...e.de>,
ruanjinjie <ruanjinjie@...wei.com>
Subject: Re: linux-next: manual merge of the fbdev tree with the drm tree
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
Powered by blists - more mailing lists