Prev: linux-next: build failure after merge of the fuse tree
Next: [PATCH V2] x86/pat: fix memory leak in free_memtype
From: Randy Dunlap on 26 May 2010 20:40
On 05/26/10 16:09, Stephen Rothwell wrote:
> Hi Randy,
>
> On Wed, 26 May 2010 09:56:06 -0700 Randy Dunlap <randy.dunlap(a)oracle.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(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 26 May 2010 21:10
Hi Randy,

On Wed, 26 May 2010 17:00:11 -0700 Randy Dunlap <randy.dunlap(a)oracle.com> wrote:
>
> uh oh. OK, thanks, I'll restore them.

Thanks. I picked them up.

--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Michal Marek on 27 May 2010 10:20
On 27.5.2010 03:03, Stephen Rothwell wrote:
> Hi Randy,
>
> On Wed, 26 May 2010 17:00:11 -0700 Randy Dunlap <randy.dunlap(a)oracle.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.

Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 27 May 2010 11:40
Hi Michal,

On Thu, 27 May 2010 16:16:12 +0200 Michal Marek <mmarek(a)suse.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(a)oracle.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(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
First  |  Prev  | 
Pages: 1 2
Prev: linux-next: build failure after merge of the fuse tree
Next: [PATCH V2] x86/pat: fix memory leak in free_memtype