[lkml]   [2011]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the hid tree with Linus' tree
On Tue, 11 Oct 2011, Stephen Rothwell wrote:

> Hi Jiri,
> Today's linux-next merge of the hid tree got a conflict in
> drivers/hid/hid-wacom.c between commit 3512069eefd3 ("Input: wacom - add
> POINTER and DIRECT device properties") from Linus' tree and commit
> 3797ef6b6bc0 ("HID: wacom: Set input bits before registration") from the
> hid tree.
> I fixed it up (maybe - see below) and can carry the fix as necessary.

That is a correct resolution, thanks.

Jiri Kosina

 \ /
  Last update: 2011-10-11 12:55    [W:0.073 / U:8.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site