On Wed, Aug 24, 2016 at 10:25 PM, Mark yao <mark.yao at rock-chips.com> wrote:
> On 2016å¹´08æ23æ¥ 21:13, Sean Paul wrote: > >> On Mon, Aug 22, 2016 at 8:40 PM, Mark yao <mark.yao at rock-chips.com> >> wrote: >> >>> On 2016å¹´08æ23æ¥ 04:30, Sean Paul wrote: >>> >>>> On Thu, Aug 18, 2016 at 6:02 AM, Mark yao <mark.yao at rock-chips.com> >>>> wrote: >>>> >>>>> 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. >>>>> >>>>> Ok, so can I get a review/ack for these revised patches then? >>>> Something is better than nothing, and there's a bunch of stuff that >>>> depends on these changes. >>>> >>>> Sean >>>> >>> Yes, But I miss your [PATCH v3 0/5] and [PATCH v3 4/5]. do you mean the >>> lost >>> patches use v2 version? >>> >>> Yes, v2 4/5 was reviewed as-is, so I just applied it. >> >> Sean >> > Applied this series to my drm-next. > > You should probably just rebase your downstream kernel on top of my branch here: https://cgit.freedesktop.org/~seanpaul/dogwood/log/?h=for-next Sean Thanks. > > > >>>> Thanks. >>>>> >>>>> -- >>>>> ï¼ark Yao >>>>> >>>>> >>>>> >>>> >>> -- >>> ï¼ark Yao >>> >>> >>> >> >> > > -- > ï¼ark Yao > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20160825/270d588c/attachment.html>
