linux-kernel - Re: [GIT] HID

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:	Thu, 2 Dec 2010 17:56:16 -0800
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-kernel@...r.kernel.org
Subject: Re: [GIT] HID

On Thu, Dec 2, 2010 at 5:24 PM, Jiri Kosina <jkosina@...e.cz> wrote:
>
> Note: you are going to get conflict in drivers/hid/hid-input.c. This is
> caused by commit a0bf0ea8 ("Input: hid-input - switch to using new keycode
> interface") which went through Dmitry's tree, as it was part of larger
> rework. It's fine to just use the variant from that commit.

Just taking Dmitry's version would have missed the removal of
KERN_DEBUG that your branch did, so I did a proper merge resolution.

Or at least it looked proper to me, and compiles. Pushed out the result,

                    Linus
--
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/