[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LNX.2.00.1209282218350.17437@pobox.suse.cz>
Date: Fri, 28 Sep 2012 22:21:22 +0200 (CEST)
From: Jiri Kosina <jkosina@...e.cz>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc: Henrik Rydberg <rydberg@...omail.se>, linux-input@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] Input and HID updates for 3.7
On Fri, 28 Sep 2012, Dmitry Torokhov wrote:
> > > Please pull this tree to receive Input and HID updates for 3.7. The
> > > tree contains input core changes, Acked by Dmitry, which substantially
> > > reduces the irqsoff latency for all input devices. It also contains MT
> > > changes which allows further memory reduction, speedup and hardware
> > > support in the HID Multitouch driver. Lastly, you get the conversion
> > > of the bcm5974 driver to MT-B, which due to the mixed dependency of
> > > the tree fits better here than anywhere else.
> > >
> > > Thanks,
> > > Henrik
> > >
> > > The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:
> > >
> > > Linux 3.6-rc4 (2012-09-01 10:39:58 -0700)
> > >
> > > are available in the git repository at:
> > >
> > > git://github.com/rydberg/linux.git for-next
> >
> > Pulled. Thanks Henrik, thanks Dmitry.
>
> Hmm, it looks like the work on making evdev using dynamic device numbers
> will clash with Henrik's changes. I think I will also pull this into my
> tree and then git should be able to resolve it all properly in -next.
That should work. Alternatively you can pull 'from-henrik' branch from my
tree in case Henrik has already ditched/rebased his tree.
And when merging to Linus shouldn't really matter, git should handle that
as well nicely.
--
Jiri Kosina
SUSE Labs
--
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/
Powered by blists - more mailing lists