From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Dave Airlie <airlied@gmail.com>
Cc: DRI Development <dri-devel@lists.freedesktop.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Subject: Re: [GIT PULL] omapdrm changes for v4.13 v2
Date: Mon, 5 Jun 2017 09:34:28 +0300 [thread overview]
Message-ID: <5bf3d100-e69c-6ff4-c99f-c1ae1f6019c9@ti.com> (raw)
In-Reply-To: <CAPM=9twKFdGML-4eVz2N36_ADDOF0TFFQYCc9hk06TX_v_Yueg@mail.gmail.com>
[-- Attachment #1.1.1: Type: text/plain, Size: 1116 bytes --]
On 03/06/17 04:31, Dave Airlie wrote:
> On 2 June 2017 at 18:48, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>> Hi Dave,
>>
>> Here's second attempt for omapdrm changes for v4.13. The first version conflicts
>> with the latest drm-next due to the DRM_ROTATE flag changes. This one is rebased
>> on top of the latest drm-next.
>
> As much as I dislike rebases (hope you tested), I did try and pull the
> original yesterday, saw conflict nightmare, and held off until I had
> more brain bandwidth to look. Thanks for providing a clean pull in the
> meantime, read my mind!
Yes, the conflict was quite messy. Of course there had to be a
DRM_ROTATE flag rename just at the same time when I did a major rotate
rework for omapdrm =).
I guess you could pull the first version, and solve the conflict by
taking the omapdrm code from the second pull request. But, while I also
dislike rebases like this (yes, I tested and compared the diff to the
first pull request), I'm not sure if that would buy us much.
In any case, I'll do a second round of testing when the pull is in drm-next.
Tomi
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2017-06-05 6:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 8:48 [GIT PULL] omapdrm changes for v4.13 v2 Tomi Valkeinen
2017-06-03 1:31 ` Dave Airlie
2017-06-05 6:34 ` Tomi Valkeinen [this message]
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=5bf3d100-e69c-6ff4-c99f-c1ae1f6019c9@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=laurent.pinchart@ideasonboard.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).