linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>, linux-input@vger.kernel.org
Subject: Re: [PATCH 2/2] intel_mid_touch: Resync upstream with the development tree
Date: Wed, 1 Sep 2010 08:04:36 -0700	[thread overview]
Message-ID: <20100901150436.GA26228@kroah.com> (raw)
In-Reply-To: <20100901062305.GE23585@core.coreip.homeip.net>

On Tue, Aug 31, 2010 at 11:23:05PM -0700, Dmitry Torokhov wrote:
> On Tue, Aug 31, 2010 at 03:17:48PM -0700, Greg KH wrote:
> > On Wed, Aug 25, 2010 at 03:22:22PM +0100, Alan Cox wrote:
> > > This merges bits from the two diverging trees including code by Andy Ross
> > > and Arjan van de Ven
> > 
> > But it doesn't apply to my staging tree, odd.
> > 
> > Care to respin it against linux-next?  Is there something in linux-next
> > from Dmitry for this driver that might be getting me confused here?
> 
> Well, I collected all patches from Alan and applied to my
> mrst-touchscreen branch (based off 2.6.35) and added a patch moving it
> out of staging and into input. Please take a look and if you do not see
> any issues I'll merge it into my 'next' branch for .37.

Ah, that's great, sorry, I didn't realize this.

> BTW, I took the liberty of tagging the move patch as Acked-by by both of you
> so please shout if you disagree.

It's fine by me, thanks for doing this.

greg k-h

      reply	other threads:[~2010-09-01 15:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-25 14:22 [PATCH 1/2] fix channel allocation in the touch screen driver Alan Cox
2010-08-25 14:22 ` [PATCH 2/2] intel_mid_touch: Resync upstream with the development tree Alan Cox
2010-08-31 22:17   ` Greg KH
2010-09-01  6:23     ` Dmitry Torokhov
2010-09-01 15:04       ` Greg KH [this message]

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=20100901150436.GA26228@kroah.com \
    --to=greg@kroah.com \
    --cc=alan@linux.intel.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.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).