Messages in this thread | | | Date | Tue, 11 Oct 2011 12:52:18 +0200 (CEST) | From | Jiri Kosina <> | Subject | Re: 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 SUSE Labs
| |