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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 11 Oct 2011 12:52:18 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jiri Kosina <jikos@...os.cz>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	David Herrmann <dh.herrmann@...glemail.com>,
	Bastien Nocera <hadess@...ess.net>,
	Jason Gerecke <killertofu@...il.com>,
	Dmitry Torokhov <dtor@...l.ru>
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
--
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/