From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCH v6 0/5] da850-evm: add gpio-{keys, leds} for UI and BB expanders Date: Mon, 13 Dec 2010 13:53:44 -0800 Message-ID: <8762ux49w7.fsf@deeprootsystems.com> References: <87tyild2ms.fsf@deeprootsystems.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: (Ben Gardiner's message of "Mon, 13 Dec 2010 12:02:32 -0500") List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces+gld-davinci-linux-open-source=gmane.org-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org Errors-To: davinci-linux-open-source-bounces+gld-davinci-linux-open-source=gmane.org-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org To: Ben Gardiner Cc: linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org, Dmitry Torokhov , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Gabor Juhos , Paul Mundt , Chris Cordahi List-Id: linux-input@vger.kernel.org QmVuIEdhcmRpbmVyIDxiZW5nYXJkaW5lckBuYW5vbWV0cmljcy5jYT4gd3JpdGVzOgoKPiBIaSBL ZXZpbiwKPgo+IE9uIEZyaSwgRGVjIDEwLCAyMDEwIGF0IDExOjMzIEFNLCBCZW4gR2FyZGluZXIK PiA8YmVuZ2FyZGluZXJAbmFub21ldHJpY3MuY2E+IHdyb3RlOgo+PiBPbiBGcmksIERlYyAxMCwg MjAxMCBhdCAxMToxNiBBTSwgS2V2aW4gSGlsbWFuCj4+PiBbLi4uXQo+Pj4gVGhpcyBzZXJpZXMg bG9va3MgZ29vZCB0byBtZSwgc28gSSdsbCBiZSBxdWV1aW5nIGl0IGluIGRhdmluY2ktbmV4dCBm b3IKPj4+IDIuNi4zOC4gwqBJdCBzaG91bGQgc2hvdyB1cCBpbiBkYXZpbmNpIGdpdCBzaG9ydGx5 LiBbLi4uXQo+Pgo+PiBUaGFuayB5b3UgdmVyeSBtdWNoLCBLZXZpbi4KPj4KPj4gSSB3aWxsIGNo ZWNrIGxpbnV4LWRhdmluY2kvbWFzdGVyIG9uIG1vbmRheS4KPgo+IEkgbG9va2VkIGF0IGdpdDov L2dpdC5rZXJuZWwub3JnL3B1Yi9zY20vbGludXgva2VybmVsL2dpdC9raGlsbWFuL2xpbnV4LWRh dmluY2kuZ2l0I2RhdmluY2ktbmV4dAo+IDsgSEVBRCBhdCB0aGUgdGltZSB3YXMKPgo+ICAgY29t bWl0IDMwMDRjZTBkM2E0NDUyNWRlNjNlMThiMDFmNzczNGJjOGQ2NGYyYzUKPiAgIEF1dGhvcjog QmVuIEdhcmRpbmVyIDxiZW5nYXJkaW5lckBuYW5vbWV0cmljcy5jYT4KPiAgIERhdGU6ICAgVGh1 IERlYyA5IDE2OjUxOjA3IDIwMTAgLTA1MDAKPgo+ICAgICAgIGRhODUwLWV2bTogS0VZQk9BUkRf R1BJT19QT0xMRUQgS2NvbmZpZyBjb25kaXRpb25hbAo+Cj4gICAgICAgVXNlIHRoZSBtYWNoLWRh dmluY2kvS2NvbmZpZyB0byBlbmFibGUgZ3Bpby1rZXlzLXBvbGxlZCBhcyBkZWZhdWx0IHdoZW4K PiAgICAgICBkYTg1MC1ldm0gbWFjaGluZSBpcyBlbmFibGVkLgo+Cj4gICAgICAgU2lnbmVkLW9m Zi1ieTogQmVuIEdhcmRpbmVyIDxiZW5nYXJkaW5lckBuYW5vbWV0cmljcy5jYT4KPiAgICAgICBD QzogS2V2aW4gSGlsbWFuIDxraGlsbWFuQGRlZXByb290c3lzdGVtcy5jb20+Cj4gICAgICAgQ0M6 ICJOb3JpLCBTZWtoYXIiIDxuc2VraGFyQHRpLmNvbT4KPiAgICAgICBDQzogR2Fib3IgSnVob3Mg PGp1aG9zZ0BvcGVud3J0Lm9yZz4KPiAgICAgICBTaWduZWQtb2ZmLWJ5OiBLZXZpbiBIaWxtYW4g PGtoaWxtYW5AZGVlcHJvb3RzeXN0ZW1zLmNvbT4KPgo+IEV2ZXJ5dGhpbmcgc2VlbXMgdG8gYmUg aW4gb3JkZXIgdGhlcmU7IEkgdGVzdGVkIHRoZSByZXN1bHRpbmcga2VybmVsCj4gd2l0aCBldnRl c3QgYW5kIHRoZSBleHBlY3RlZCBvdXRwdXQgd2FzIG9ic2VydmVkLiBOb3RlIHRoYXQKPiBkYXZp bmNpLW5leHQgc3RpbGwgY29udGFpbnMgdGhlIGNoZXJyeS1waWNrIG9mIHRoZSB1cHN0cmVhbSBj b21taXQgb2YKPiB0aGUgcG9sbGVkIGdwaW8ga2V5cyBkcml2ZXI6Cgpvb3BzLi4uIEkndmUgbm93 IHJlbW92ZWQgdGhhdCwgc2luY2UgaXQgaXMgcGFydCBvZiB2Mi42LjM2LXJjNSBhbHJlYWR5LgpU aGFua3MgZm9yIGNoZWNraW5nLgoKWy4uLl0KID4gSSBhbHNvIGxvb2tlZCBhdAo+IGdpdDovL2dp dC5rZXJuZWwub3JnL3B1Yi9zY20vbGludXgva2VybmVsL2dpdC9raGlsbWFuL2xpbnV4LWRhdmlu Y2kuZ2l0I21hc3Rlcgo+IDsgSEVBRCBhdCB0aGUgdGltZSB3YXMKPgo+ICAgY29tbWl0IDRiZmJk ZGRjMDY1NWEyODRhOTgzMDRiYzM0M2M2YmNhZjgxYjhlNGQKPiAgIE1lcmdlOiA3NzEyMTVjIDc1 MDdmZDMKPiAgIEF1dGhvcjogS2V2aW4gSGlsbWFuIDxraGlsbWFuQGRlZXByb290c3lzdGVtcy5j b20+Cj4gICBEYXRlOiAgIEZyaSBEZWMgMTAgMTY6MjU6MjcgMjAxMCAtMDgwMAo+Cj4gICAgICAg cmVidWlsZCBsaW51eC1kYXZpbmNpIGZyb20gYnJhbmNoZXMKPgo+IFRoZXJlIGFwcGVhcnMgdG8g YmUgc29tZSBkb3VibGUgY29tbWl0cyBvZiB0aGUgcGF0Y2ggc2VyaWVzLiBJIHRlc3RlZAo+IGl0 IHdpdGggZXZ0ZXN0IGFueXdheXMgYW5kIGFsc28gb2JzZXJ2ZWQgdGhlIGV4cGVjdGVkIG91dHB1 dC4KPgo+IFRoZSBmb2xsb3dpbmcgY29tbWFuZCBhbmQgaXRzIG91dHB1dCBob3BlZnVsbHkgZGVt b25zdHJhdGUgd2hhdCBJIGFtCj4gc2VlaW5nIGFzIGRvdWJsZSBjb21taXRzLgoKWWVzLCB0aGVy ZSB3aWxsIGJlIGRvdWJsZSBjb21taXRzIGluIG1hc3RlciwgYmVjYXVzZSBvZiB0aGUgd2F5IEkg bWFuYWdlCm1hc3RlciB1c2luZyAnZ2l0IG1lcmdlIC1vdXJzJy4gIEJ1dCB0aGVyZSBzaG91bGRu J3QgYmUgZG91YmxlIGNvbW1pdHMKYmV0d2VlbiBteSAicmVidWlsZCBmcm9tIGJyYWNoZXMiIG1l cmdlcy4gIEl0IGNhbiBiZSBjb25mdXNpbmcsIGJ1dCBpZgp5b3UgbG9vayBhdCB0aGUgaGlzdG9y eSB3aXRoIGEgZ3JhcGhpY2FsIHRvb2wgbGlrZSAnZ2l0aycsIGl0IG1pZ2h0IHNoZWQKc29tZSBs aWdodCBvbiB3aGF0IGlzIGdvaW5nIG9uLgoKSSBrbm93IGl0J3MgY29uZnVzaW5nLCBidXQgdGhl IGRhdmluY2ktbmV4dCBicmFuY2ggaXMgdGhlIG9ubHkgaW1wb3J0YW50CmJyYW5jaCBpbiB0aGlz IHRyZWUgZm9yIHVwc3RyZWFtIHB1cnBvc2VzLgoKWy4uLl0KCj4gTm90ZSB0aGF0IHRoZSBjaGVy cnkgcGljayBvZiB0aGUgdXBzdHJlYW0gY29tbWl0IG9mIHRoZSBwb2xsZWQgZ3Bpbwo+IGtleXMg ZHJpdmVyIGlzIGhlcmUgaW4gJ21hc3RlcicgYWxzby4KClllYWgsIHRoYXQgY2FtZSBmcm9tIGRh dmluYy1uZXh0LiAgTm93IHRoYXQgaXQncyByZW1vdmVkIGZyb20gdGhlcmUsIGl0CnNob3VsZCBi ZSBvay4KCkkganVzdCBwdXNoZWQgYW4gdXBkYXRlZCBkYXZpbmNpLW5leHQgYW5kIG1hc3RlciBi cmFuY2guICBJdCBzb21ldGltZXMKdGFrZXMgYSBiaXQgdG8gcHJvcGFnYXRlIHRvIGFsbCB0aGUg a2VybmVsLm9yZyBtaXJyb3JzLCBidXQgdGhlIHVwZGF0ZQpzaG91bGQgYmUgdGhlcmUgc2hvcnRs eS4KClRoYW5rcywKCktldmluCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkRhdmluY2ktbGludXgtb3Blbi1zb3VyY2UgbWFpbGluZyBsaXN0CkRhdmluY2kt bGludXgtb3Blbi1zb3VyY2VAbGludXguZGF2aW5jaWRzcC5jb20KaHR0cDovL2xpbnV4LmRhdmlu Y2lkc3AuY29tL21haWxtYW4vbGlzdGluZm8vZGF2aW5jaS1saW51eC1vcGVuLXNvdXJjZQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758162Ab0LMVx4 (ORCPT ); Mon, 13 Dec 2010 16:53:56 -0500 Received: from mail-yw0-f46.google.com ([209.85.213.46]:64599 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752190Ab0LMVxx convert rfc822-to-8bit (ORCPT ); Mon, 13 Dec 2010 16:53:53 -0500 From: Kevin Hilman To: Ben Gardiner Cc: davinci-linux-open-source@linux.davincidsp.com, linux-input@vger.kernel.org, Dmitry Torokhov , linux-kernel@vger.kernel.org, Chris Cordahi , Paul Mundt , Sekhar Nori , Gabor Juhos Subject: Re: [PATCH v6 0/5] da850-evm: add gpio-{keys,leds} for UI and BB expanders Organization: Deep Root Systems, LLC References: <87tyild2ms.fsf@deeprootsystems.com> Date: Mon, 13 Dec 2010 13:53:44 -0800 In-Reply-To: (Ben Gardiner's message of "Mon, 13 Dec 2010 12:02:32 -0500") Message-ID: <8762ux49w7.fsf@deeprootsystems.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ben Gardiner writes: > Hi Kevin, > > On Fri, Dec 10, 2010 at 11:33 AM, Ben Gardiner > wrote: >> On Fri, Dec 10, 2010 at 11:16 AM, Kevin Hilman >>> [...] >>> This series looks good to me, so I'll be queuing it in davinci-next for >>> 2.6.38.  It should show up in davinci git shortly. [...] >> >> Thank you very much, Kevin. >> >> I will check linux-davinci/master on monday. > > I looked at git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next > ; HEAD at the time was > > commit 3004ce0d3a44525de63e18b01f7734bc8d64f2c5 > Author: Ben Gardiner > Date: Thu Dec 9 16:51:07 2010 -0500 > > da850-evm: KEYBOARD_GPIO_POLLED Kconfig conditional > > Use the mach-davinci/Kconfig to enable gpio-keys-polled as default when > da850-evm machine is enabled. > > Signed-off-by: Ben Gardiner > CC: Kevin Hilman > CC: "Nori, Sekhar" > CC: Gabor Juhos > Signed-off-by: Kevin Hilman > > Everything seems to be in order there; I tested the resulting kernel > with evtest and the expected output was observed. Note that > davinci-next still contains the cherry-pick of the upstream commit of > the polled gpio keys driver: oops... I've now removed that, since it is part of v2.6.36-rc5 already. Thanks for checking. [...] > I also looked at > git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#master > ; HEAD at the time was > > commit 4bfbdddc0655a284a98304bc343c6bcaf81b8e4d > Merge: 771215c 7507fd3 > Author: Kevin Hilman > Date: Fri Dec 10 16:25:27 2010 -0800 > > rebuild linux-davinci from branches > > There appears to be some double commits of the patch series. I tested > it with evtest anyways and also observed the expected output. > > The following command and its output hopefully demonstrate what I am > seeing as double commits. Yes, there will be double commits in master, because of the way I manage master using 'git merge -ours'. But there shouldn't be double commits between my "rebuild from braches" merges. It can be confusing, but if you look at the history with a graphical tool like 'gitk', it might shed some light on what is going on. I know it's confusing, but the davinci-next branch is the only important branch in this tree for upstream purposes. [...] > Note that the cherry pick of the upstream commit of the polled gpio > keys driver is here in 'master' also. Yeah, that came from davinc-next. Now that it's removed from there, it should be ok. I just pushed an updated davinci-next and master branch. It sometimes takes a bit to propagate to all the kernel.org mirrors, but the update should be there shortly. Thanks, Kevin