From: Michal Marek <mmarek@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Randy Dunlap <randy.dunlap@oracle.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
matt mooney <mfm@muteddisk.com>, Kirill Smelkov <kirr@mns.spb.ru>
Subject: Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree
Date: Thu, 27 May 2010 16:16:12 +0200 [thread overview]
Message-ID: <4BFE7EAC.9090408@suse.cz> (raw)
In-Reply-To: <20100527110357.f295d4ef.sfr@canb.auug.org.au>
On 27.5.2010 03:03, Stephen Rothwell wrote:
> Hi Randy,
>
> On Wed, 26 May 2010 17:00:11 -0700 Randy Dunlap <randy.dunlap@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
next prev parent reply other threads:[~2010-05-27 14:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-26 1:53 linux-next: manual merge of the kbuild tree with the kernel-doc tree Stephen Rothwell
2010-05-26 15:47 ` Randy Dunlap
2010-05-26 16:50 ` Stephen Rothwell
2010-05-26 16:56 ` Randy Dunlap
2010-05-26 23:09 ` Stephen Rothwell
2010-05-27 0:00 ` Randy Dunlap
2010-05-27 1:03 ` Stephen Rothwell
2010-05-27 14:16 ` Michal Marek [this message]
2010-05-27 15:34 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BFE7EAC.9090408@suse.cz \
--to=mmarek@suse.cz \
--cc=kirr@mns.spb.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mfm@muteddisk.com \
--cc=randy.dunlap@oracle.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.