linux-kernel - Re: linux-next: manual merge of the input tree with the s5p 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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20111111165741.5a6d5f14ad70f98776d3b39a@canb.auug.org.au>
Date:	Fri, 11 Nov 2011 16:57:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thomas Abraham <thomas.abraham@...aro.org>,
	Kukjin Kim <kgene.kim@...sung.com>
Subject: Re: linux-next: manual merge of the input tree with the s5p tree

Hi Dmitry,

On Thu, 10 Nov 2011 19:41:59 -0800 Dmitry Torokhov <dmitry.torokhov@...il.com> wrote:
>
> Please drop the whole HAVE_SAMSUNG_KEYPAD thing; HAVE_CLK is all
> this driver needs. Expanding beyond Samsung will allow greater
> compile coverage.

OK, I have modified the conflict resolution for tomorrow.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped