linux-kernel - Re: [git pull] Please pull from powerpc.git merge branch

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: <fa686aa40807251155i399f8ab0x931e1f44dd6fd82a@mail.gmail.com>
Date:	Fri, 25 Jul 2008 14:55:07 -0400
From:	"Grant Likely" <grant.likely@...retlab.ca>
To:	"Linus Torvalds" <torvalds@...ux-foundation.org>
Cc:	"Benjamin Herrenschmidt" <benh@...nel.crashing.org>,
	"linuxppc-dev list" <linuxppc-dev@...abs.org>,
	akpm <akpm@...ux-foundation.org>,
	"Linux Kernel list" <linux-kernel@...r.kernel.org>
Subject: Re: [git pull] Please pull from powerpc.git merge branch

On Fri, Jul 25, 2008 at 2:10 PM, Linus Torvalds
<torvalds@...ux-foundation.org> wrote:
>
>
> On Fri, 25 Jul 2008, Benjamin Herrenschmidt wrote:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
>
> Ok, I got a conflict in arch/powerpc/platforms/52xx/Kconfig, you should
> check that I fixed it up right and send me follow-up patches if required.

Okay, I'll do that

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.