linux-kernel - Re: linux-next: manual merge of the kbuild tree with the kernel-doc 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:	Fri, 28 May 2010 01:34:02 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Michal Marek <mmarek@...e.cz>
Cc:	Randy Dunlap <randy.dunlap@...cle.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, matt mooney <mfm@...eddisk.com>,
	Kirill Smelkov <kirr@....spb.ru>
Subject: Re: linux-next: manual merge of the kbuild tree with the kernel-doc
 tree

Hi Michal,

On Thu, 27 May 2010 16:16:12 +0200 Michal Marek <mmarek@...e.cz> wrote:
>
> On 27.5.2010 03:03, Stephen Rothwell wrote:
> > Hi Randy,
> > 
> > On Wed, 26 May 2010 17:00:11 -0700 Randy Dunlap <randy.dunlap@...cle.com> wrote:
> >> uh oh.  OK, thanks, I'll restore them.
> > 
> > Thanks.  I picked them up.
> 
> I reverted part of the kbuild patch so that the two trees merge cleanly
> again.

Thanks.

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

Content of type "application/pgp-signature" skipped