From: Helge Deller <deller@gmx•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
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: Re: linux-next: manual merge of the fbdev tree with the drm tree
Date: Tue, 4 Oct 2022 09:29:12 +0200 [thread overview]
Message-ID: <9e45b60b-4af5-4fed-7b7d-3a5c4dcd6321@gmx.de> (raw)
In-Reply-To: <20221004132723.7b4b03ab@canb.auug.org.au>
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
next prev parent reply other threads:[~2022-10-04 7:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 2:27 linux-next: manual merge of the fbdev tree with the drm tree Stephen Rothwell
2022-10-04 7:29 ` Helge Deller [this message]
-- 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=9e45b60b-4af5-4fed-7b7d-3a5c4dcd6321@gmx.de \
--to=deller@gmx$(echo .)de \
--cc=airlied@redhat$(echo .)com \
--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=sfr@canb$(echo .)auug.org.au \
--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