From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Henrik Rydberg" Subject: Re: [GIT PULL] Input and HID updates for 3.7 Date: Sat, 29 Sep 2012 11:02:17 +0200 Message-ID: <20120929090217.GA1290@polaris.bitmath.org> References: <20120919185605.GA778@polaris.bitmath.org> <20120928173539.GB6356@core.coreip.homeip.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Jiri Kosina Cc: Dmitry Torokhov , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-input@vger.kernel.org > > 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. The tree will remain the same until after 3.7-rc1 is out, so pulling should be fine. Thanks, Henrik