[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100527090923.c17a7ed4.sfr@canb.auug.org.au>
Date: Thu, 27 May 2010 09:09:23 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Randy Dunlap <randy.dunlap@...cle.com>
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
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).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists