public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Daniel Kurtz <djkurtz@chromium.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Henrik Rydberg <rydberg@euromail.se>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Lars-Peter Clausen <lars@metafoo.de>
Subject: Re: linux-next: manual merge of the input-mt tree with the input-current tree
Date: Thu, 5 Jul 2012 10:19:05 -0700	[thread overview]
Message-ID: <20120705171904.GA31383@core.coreip.homeip.net> (raw)
In-Reply-To: <CAGS+omDab9mOOf6pCryRTyLvYA66h0XjqmFPc-vrAo4hkfGN0A@mail.gmail.com>

Hi Henrik,

On Thu, Jul 05, 2012 at 11:57:14AM +0800, Daniel Kurtz wrote:
> On Thu, Jul 5, 2012 at 11:52 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Henrik,
> >
> > Today's linux-next merge of the input-mt tree got a conflict in
> > drivers/input/touchscreen/atmel_mxt_ts.c between commit 9b7e31bbf4bb
> > ("Input: request threaded-only IRQs with IRQF_ONESHOT") from the
> > input-current tree and commit c2ef9a1a248b ("Input: atmel_mxt_ts - use
> > client name for irq") from the input-mt tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
> 
> Looks good to me. Don't know if you need it for a merge, but:
> 
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> 

Hmm, maybe it is time I pull your tree?

Thanks.

-- 
Dmitry

  reply	other threads:[~2012-07-05 17:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-05  3:52 linux-next: manual merge of the input-mt tree with the input-current tree Stephen Rothwell
2012-07-05  3:57 ` Daniel Kurtz
2012-07-05 17:19   ` Dmitry Torokhov [this message]
2012-07-05 17:57     ` Henrik Rydberg
2012-07-06  5:25       ` Dmitry Torokhov

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=20120705171904.GA31383@core.coreip.homeip.net \
    --to=dmitry.torokhov@gmail.com \
    --cc=djkurtz@chromium.org \
    --cc=lars@metafoo.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rydberg@euromail.se \
    --cc=sfr@canb.auug.org.au \
    /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