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] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 26 May 2010 17:00:11 -0700
From:	Randy Dunlap <randy.dunlap@...cle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Michal Marek <mmarek@...e.cz>, 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

On 05/26/10 16:09, Stephen Rothwell wrote:
> Hi Randy,
> 
> On Wed, 26 May 2010 09:56:06 -0700 Randy Dunlap <randy.dunlap@...cle.com> wrote:
>>
>>> The kernel-doc tree is a quilt series :-(
>>
>> Yes.  and it's viewable without pulling/cloning.  ;)
> 
> Ah, I shouldn't reply to emails so late at night :-(
> 
>>> You can, of course, see the above commit in the linux-next tree via
>>> gitweb on kernel.org.
>>
>> Thanks.  Michal, I droppped these 3 patches.  Please keep them in the
>> kbuild tree.
> 
> If anything, the kernel-doc patches should be kept as they are much more
> extensive.  And the conflict was trivial.  The kbuild patch was just
> fixing a typo (tey -> they).

uh oh.  OK, thanks, I'll restore them.

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
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/