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  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]
Date:	Thu, 18 Feb 2010 15:16:19 +0000
From:	Jonathan Cameron <>
To:	Stephen Rothwell <>
CC:	Zhang Rui <>,,,
	Alan Jenkins <>
Subject: Re: linux-next: manual merge of the als tree with Linus' tree

On 02/18/10 06:11, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the als tree got a conflict in drivers/misc/Kconfig between commit 8c5d30e590593495c5bb8bd4a2519ce1ac909a22 ("dell-laptop: remove duplicate Kconfig entry under drivers/misc") from Linus' tree and commit 6600f58cfc348ef5862876ab4965d95aad793429 ("isl29003: Move from misc to als now it available with minimal changes") from the als tree.
> Just context changes.  I fixed it up (see below) and can carry the change
> for a while.
Thanks Stephen and sorry for wasting your time!

I've reset that last patch, merged Linus' current tree and reapplied it on top with the
merge problems fixed up.  While I was there I edited the commit message so it was actually
English (oops).

Anyhow, (fingers crossed), it should now work fine.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

Powered by blists - more mailing lists