From: Lee Jones <lee.jones@linaro.org>
To: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
grant.likely@secretlab.ca, rabin.vincent@stericsson.com,
shiraz.hashim@st.com, devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org, spear-devel@list.st.com,
linus.walleij@linaro.org,
Vipul Kumar Samar <vipulkumar.samar@st.com>
Subject: Re: [PATCH V5 2/2] mfd: stmpe: Update DT support in stmpe driver
Date: Fri, 30 Nov 2012 13:20:36 +0000 [thread overview]
Message-ID: <20121130132036.GA23648@gmail.com> (raw)
In-Reply-To: <CAKohpomNFmLwf-Gs_mmXV0ULU87-FWCxVGUTfrEM-m6NNt3nPw@mail.gmail.com>
On Fri, 30 Nov 2012, Viresh Kumar wrote:
> On 30 November 2012 18:15, Lee Jones <lee.jones@linaro.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@infradead.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
next prev parent reply other threads:[~2012-11-30 13:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-29 14:40 [PATCH V5 1/2] mfd: stmpe: Get rid of irq_invert_polarity Viresh Kumar
[not found] ` <2dcd7cb4c4022fa24b5328974e4226f5aaf89419.1354199865.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2012-11-29 14:40 ` [PATCH V5 2/2] mfd: stmpe: Update DT support in stmpe driver Viresh Kumar
[not found] ` <121653def4e985b0c1b59045637dd4518f97e73a.1354199865.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2012-11-30 10:57 ` Samuel Ortiz
2012-11-30 12:45 ` Lee Jones
2012-11-30 13:11 ` Viresh Kumar
2012-11-30 13:20 ` Lee Jones [this message]
[not found] ` <20121130132036.GA23648-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-11-30 13:44 ` Viresh Kumar
2012-11-30 15:45 ` Lee Jones
2012-11-30 19:03 ` Viresh Kumar
2012-12-05 13:03 ` Viresh Kumar
2012-12-05 13:19 ` Lee Jones
2012-12-05 13:24 ` Viresh Kumar
2012-12-05 22:42 ` Grant Likely
2012-12-06 1:58 ` Viresh Kumar
2012-12-06 9:50 ` Lee Jones
[not found] ` <20121206095019.GN2718-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-12-06 9:56 ` Viresh Kumar
[not found] ` <CAKohpokNQB6L2vvjmvA7_3KomFXnV9wZ-uBjrfRVuBL=QWgr_Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-12-06 10:11 ` Lee Jones
2012-12-06 10:19 ` Viresh Kumar
2012-12-06 10:35 ` Lee Jones
2012-12-06 10:42 ` Viresh Kumar
2012-12-06 11:12 ` Lee Jones
2012-12-06 11:19 ` Viresh Kumar
[not found] ` <CAKohponrZ8a+=ozXox60nRVBO174Nr=GoSjKkkz7KjLCxd5BhQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-12-06 11:33 ` Lee Jones
2012-12-07 13:37 ` Grant Likely
2012-12-06 2:36 ` Viresh Kumar
2012-12-07 13:44 ` Grant Likely
2012-12-01 16:49 ` [PATCH V5 1/2] mfd: stmpe: Get rid of irq_invert_polarity Linus Walleij
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=20121130132036.GA23648@gmail.com \
--to=lee.jones@linaro.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rabin.vincent@stericsson.com \
--cc=sameo@linux.intel.com \
--cc=shiraz.hashim@st.com \
--cc=spear-devel@list.st.com \
--cc=vipulkumar.samar@st.com \
--cc=viresh.kumar@linaro.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).