linux-kernel - Re: linux-next: manual merge of the input-mt tree with the input-current tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20120706052551.GB6804@core.coreip.homeip.net>
Date:	Thu, 5 Jul 2012 22:25:51 -0700
From:	Dmitry Torokhov <dmitry.torokhov@...il.com>
To:	Henrik Rydberg <rydberg@...omail.se>
Cc:	Daniel Kurtz <djkurtz@...omium.org>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lars-Peter Clausen <lars@...afoo.de>
Subject: Re: linux-next: manual merge of the input-mt tree with the
 input-current tree

On Thu, Jul 05, 2012 at 07:57:23PM +0200, Henrik Rydberg wrote:
> On Thu, Jul 05, 2012 at 10:19:05AM -0700, Dmitry Torokhov wrote:
> > 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@...b.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@...omium.org>
> > > 
> > 
> > Hmm, maybe it is time I pull your tree?
> 
> By all means, I have nothing further planned for the merge window. I
> wanted to wait until Linus pulls your current tree, then pull in the
> merge conflict, then eventual reverts, then send you a pull
> request. IOW, something like tomorrow. Sounds good?

You do not need to wait for Linus to pull and push: I will merge my
for-linus branch into next and pull and resolve your changes and then
git magic should take care of the rest.

So just send me a pull request.

Thanks.

-- 
Dmitry
--
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/