Re: linux-next: manual merge of the hid tree with Linus' tree

[Jiri Kosina]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/