From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754045AbcHRKKM (ORCPT ); Thu, 18 Aug 2016 06:10:12 -0400 Received: from regular1.263xmail.com ([211.150.99.138]:43898 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753590AbcHRKKL (ORCPT ); Thu, 18 Aug 2016 06:10:11 -0400 X-263anti-spam: KSV:0;BIG:0;ABS:1;DNS:0;ATT:0;SPF:S; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ADDR-CHECKED: 0 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: linux-arm-kernel@lists.infradead.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <46c6e6a7260443e20f0e143b17d16c87> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v3 1/5] drm/rockchip: sort registers define by chip's number To: Sean Paul , tfiga@chromium.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <1471454452-2151-1-git-send-email-seanpaul@chromium.org> <57B57AFE.2030706@rock-chips.com> <20160818091141.GZ6232@phenom.ffwll.local> From: Mark yao Message-ID: <57B587C0.5050007@rock-chips.com> Date: Thu, 18 Aug 2016 18:02:40 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20160818091141.GZ6232@phenom.ffwll.local> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: [PATCH v3 1/5] drm/rockchip: sort registers define by chip's number Date: Thu, 18 Aug 2016 18:02:40 +0800 Message-ID: <57B587C0.5050007@rock-chips.com> References: <1471454452-2151-1-git-send-email-seanpaul@chromium.org> <57B57AFE.2030706@rock-chips.com> <20160818091141.GZ6232@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160818091141.GZ6232@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sean Paul , tfiga@chromium.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org T24gMjAxNuW5tDA45pyIMTjml6UgMTc6MTEsIERhbmllbCBWZXR0ZXIgd3JvdGU6Cj4gT24gVGh1 LCBBdWcgMTgsIDIwMTYgYXQgMDU6MDg6MTRQTSArMDgwMCwgTWFyayB5YW8gd3JvdGU6Cj4+ID5I aSBTZWFuCj4+ID4KPj4gPlRoYW5rcyBmb3Igc2VuZCB2MyBwYXRjaCBmb3IgcmszMzk5IHZvcCBz dXBwb3J0Lgo+PiA+Cj4+ID5CdXQgc29ycnkgZm9yIHRoYXQsIEkgaGFkIGNoYW5nZWQgbXkgbWlu ZCwgdGhvc2UgcGF0Y2hlcyBhcmUgZGVwcmVjYXRlZCwKPj4gPkkgaGF2ZSBuZXcgcmszMzk5IHBh dGNoIG9uIG15IGRvd25zdHJlYW0ga2VybmVsLCBJIHdpbGwgdXBzdHJlYW0gc29vbi4KPiBXdXQ/ IEltbyBtZXJnZSBTZWFuJ3MgcGF0Y2ggaGVyZSwgYW5kIHRoZW4gcmViYXNlIHlvdXIgZG93bnN0 cmVhbSBwYXRjaGVzCj4gb24gdG9wIG9mIGl0LiBUaGF0IHlvdSBoYXZlIGEgZG93bnN0cmVhbSB0 cmVlIHdoaWNoIGlzIG91dCBvZiBzeW5jIHdpdGgKPiB1cHN0cmVhbSBzaG91bGRuJ3QgYmUgYSBy ZWFzb24gdG8gc3RhbGwgdXBzdHJlYW0gZGV2ZWxvcG1lbnQuCj4gLURhbmllbAo+ClllYWgsIFNv cnJ5IGZvciB0aGF0LgoKSW4gZmFjdCwgb24gbXkgZG93bnN0cmVhbSBrZXJuZWwsIGFsc28gaGF2 ZSB0aG9zZSBwYXRjaGVzLCBteSBuZXcgcmszMzk5IApwYXRjaGVzIGFyZSBiYXNlZCBvbiB0aGVt LApidXQgdGhlIG5ldyByazMzOTkgcGF0Y2hlcyB3aWxsIGNvdmVyIHRoZSB0aG9zZSBwYXRjaGVz LCAgU2VhbidzIHBhdGNoZXMgCmlzIG9sZCB2ZXJzaW9uLgoKSSBqdXN0IHdhbnQgdG8gZmFzdCBm b3J3YXJkLCBkb24ndCB3YW50IHRvIHNlbmQgdHdvIHZlcnNpb24gZHJpdmVycyB0byAKdXBzdHJl YW0uCmJ1dCBpZiB5b3UgYW5kIERhdmUgZmVlbCBvayBmb3IgdGhhdCwgSSBoYXZlIG5vIHByb2Js ZW06LSkgLgoKbWVyZ2VkIFNlYW4ncyBwYXRjaGVzIGFuZCB0aGVuIGFwcGx5IG5ldyB2ZXJzaW9u IHBhdGNoZXMuCgpUaGFua3MuCgotLSAK77ytYXJrIFlhbwoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Thu, 18 Aug 2016 18:02:40 +0800 Subject: [PATCH v3 1/5] drm/rockchip: sort registers define by chip's number In-Reply-To: <20160818091141.GZ6232@phenom.ffwll.local> References: <1471454452-2151-1-git-send-email-seanpaul@chromium.org> <57B57AFE.2030706@rock-chips.com> <20160818091141.GZ6232@phenom.ffwll.local> Message-ID: <57B587C0.5050007@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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