From: Mark Brown <broonie@kernel•org>
To: Daniel Vetter <daniel.vetter@ffwll•ch>
Cc: Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Zack Rusin <zackr@vmware•com>
Subject: Re: linux-next: manual merge of the drm-misc tree with the drm-next tree
Date: Tue, 27 Jul 2021 13:01:22 +0100 [thread overview]
Message-ID: <20210727120122.GR4670@sirena.org.uk> (raw)
In-Reply-To: <CAKMK7uFNFOTrcLbFW3eoziPaZaH9JFKJe1AVvJGT6wU_rqfUeA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
On Tue, Jul 27, 2021 at 01:41:30PM +0200, Daniel Vetter wrote:
> On Tue, Jul 27, 2021 at 1:15 PM Mark Brown <broonie@kernel•org> wrote:
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> > between commit:
> > ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")
> > from the drm-next tree and commit:
> > be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")
> > from the drm-misc tree.
> I got confused for a bit how we managed a conflict here because vmwgfx
> flows drm-misc.git -> drm.git -> linus. The 2nd patch is in
> drm-misc-fixes, which makes sense, not in drm-misc-next like I assumed
> at first drm-misc means.
I probably misidentified the tree when I was reporting things TBH -
there's so many DRM trees and they're constantly generating conflicts
that I sometimes rush through it a bit, especially for the simpler ones
like this.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-07-27 12:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 11:14 linux-next: manual merge of the drm-misc tree with the drm-next tree Mark Brown
2021-07-27 11:41 ` Daniel Vetter
2021-07-27 12:01 ` Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-20 14:30 Mark Brown
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=20210727120122.GR4670@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=zackr@vmware$(echo .)com \
/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