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>,
Randy Dunlap <rdunlap@infradead•org>,
Thomas Zimmermann <tzimmermann@suse•de>
Subject: Re: linux-next: manual merge of the fbdev tree with the drm tree
Date: Tue, 13 Dec 2022 12:10:29 +0100 [thread overview]
Message-ID: <4a846563-c0b3-ca89-382b-ef59867b2713@gmx.de> (raw)
In-Reply-To: <20221213111612.7bc1f917@canb.auug.org.au>
On 12/13/22 01:16, Stephen Rothwell wrote:
> Today's linux-next merge of the fbdev tree got a conflict in:
> drivers/video/fbdev/Kconfig
> between commit:
> c8a17756c425 ("drm/ofdrm: Add ofdrm for Open Firmware framebuffers")
> from the drm tree and commit:
> 225e095bbd3a ("fbdev: offb: make offb driver tristate")
> from the fbdev tree.
I've dropped that patch from the fbdev git tree to resolve the
conflict. It didn't applied cleanly anyway, so @Randy please
resend a new patch if required.
Thanks!
Helge
> 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.
>
next prev parent reply other threads:[~2022-12-13 11:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-13 0:16 linux-next: manual merge of the fbdev tree with the drm tree Stephen Rothwell
2022-12-13 11:10 ` 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-10-04 2:27 Stephen Rothwell
2022-10-04 7:29 ` 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=4a846563-c0b3-ca89-382b-ef59867b2713@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=rdunlap@infradead$(echo .)org \
--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