Re: linux-next: manual merge of the input-mt tree with theinput-current tree
From: Dmitry Torokhov
Date: Thu Jul 05 2012 - 13:19:15 EST
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@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxx>
Hmm, maybe it is time I pull your tree?
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/