lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 30 Nov 2012 13:20:36 +0000 From: Lee Jones <lee.jones@...aro.org> To: Viresh Kumar <viresh.kumar@...aro.org> Cc: Samuel Ortiz <sameo@...ux.intel.com>, grant.likely@...retlab.ca, rabin.vincent@...ricsson.com, shiraz.hashim@...com, devicetree-discuss@...ts.ozlabs.org, linux-kernel@...r.kernel.org, spear-devel@...t.st.com, linus.walleij@...aro.org, Vipul Kumar Samar <vipulkumar.samar@...com> Subject: Re: [PATCH V5 2/2] mfd: stmpe: Update DT support in stmpe driver On Fri, 30 Nov 2012, Viresh Kumar wrote: > On 30 November 2012 18:15, Lee Jones <lee.jones@...aro.org> wrote: > > The patch doesn't apply for me - does it for you? > > > > Viresh, what's it based on? > > Because this was applied 2 days back by Samuel, and i didn't > fetch it again yesterday: > > commit 20d5c7defc228cdaeff3ce3442f3a4e86af293c1 > Author: Randy Dunlap <rdunlap@...radead.org> > Date: Mon Nov 12 09:20:49 2012 -0800 > > Its a simple conflict to fix, as this is the only place of conflict. Eh? You don't know what my tree is based on. ;) What does this patch apply on top of? Which -rc? -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists