From: Mark yao <mark.yao@rock-chips.com>
To: Sean Paul <seanpaul@chromium.org>,
tfiga@chromium.org, dri-devel@lists.freedesktop.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v3 1/5] drm/rockchip: sort registers define by chip's number
Date: Thu, 18 Aug 2016 18:02:40 +0800 [thread overview]
Message-ID: <57B587C0.5050007@rock-chips.com> (raw)
In-Reply-To: <20160818091141.GZ6232@phenom.ffwll.local>
On 2016年08月18日 17:11, Daniel Vetter wrote:
> On Thu, Aug 18, 2016 at 05:08:14PM +0800, Mark yao wrote:
>> >Hi Sean
>> >
>> >Thanks for send v3 patch for rk3399 vop support.
>> >
>> >But sorry for that, I had changed my mind, those patches are deprecated,
>> >I have new rk3399 patch on my downstream kernel, I will upstream soon.
> Wut? Imo merge Sean's patch here, and then rebase your downstream patches
> on top of it. That you have a downstream tree which is out of sync with
> upstream shouldn't be a reason to stall upstream development.
> -Daniel
>
Yeah, Sorry for that.
In fact, on my downstream kernel, also have those patches, my new rk3399
patches are based on them,
but the new rk3399 patches will cover the those patches, Sean's patches
is old version.
I just want to fast forward, don't want to send two version drivers to
upstream.
but if you and Dave feel ok for that, I have no problem:-) .
merged Sean's patches and then apply new version patches.
Thanks.
--
Ｍark Yao
next prev parent reply other threads:[~2016-08-18 10:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <loom.20160602T084340-509@post.gmane.org>
2016-08-17 17:20 ` [PATCH v3 1/5] drm/rockchip: sort registers define by chip's number Sean Paul
2016-08-18 9:08 ` Mark yao
2016-08-18 9:11 ` Daniel Vetter
2016-08-18 10:02 ` Mark yao [this message]
2016-08-22 20:30 ` Sean Paul
2016-08-23 0:40 ` Mark yao
2016-08-23 13:13 ` Sean Paul
2016-08-25 2:25 ` Mark yao
[not found] ` <CAOw6vbJi+yV11npBZYi2MHTccSL_0HuuxGidLhmwjV--U6q-wQ@mail.gmail.com>
2016-08-25 17:17 ` Sean Paul
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=57B587C0.5050007@rock-chips.com \
--to=mark.yao@rock-chips.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=seanpaul@chromium.org \
--cc=tfiga@chromium.org \
/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).