Linux-Next discussions
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Christoph Lameter <cl@linux-foundation.org>,
	linux-next@vger.kernel.org,
	Randy Dunlap <randy.dunlap@oracle.com>,
	Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Subject: Re: linux-next: manual merge of the slab tree
Date: Wed, 13 Aug 2008 17:40:16 +1000	[thread overview]
Message-ID: <20080813174016.b0a317e3.sfr@canb.auug.org.au> (raw)
In-Reply-To: <48A28B6B.9030907@cs.helsinki.fi>

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

Hi Pekka,

On Wed, 13 Aug 2008 10:21:15 +0300 Pekka Enberg <penberg@cs.helsinki.fi> wrote:
>
> I've now fixed up the conflict in my tree. Thanks Stephen!

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

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

  reply	other threads:[~2008-08-13  7:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-13  4:57 linux-next: manual merge of the slab tree Stephen Rothwell
2008-08-13  6:19 ` Pekka Enberg
2008-08-13  7:11   ` Stephen Rothwell
2008-08-13  7:10     ` Pekka Enberg
2008-08-13  7:36       ` Stephen Rothwell
2008-08-13  7:21 ` Pekka Enberg
2008-08-13  7:40   ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-10-21  4:55 Stephen Rothwell
2008-11-03  4:07 Stephen Rothwell
2008-11-03  9:38 ` Pekka Enberg
2008-11-03  4:19 Stephen Rothwell
2008-11-03  4:52 ` KOSAKI Motohiro
2008-11-03  9:39 ` Pekka Enberg
2008-11-03  4:26 Stephen Rothwell
2008-11-03  9:39 ` Pekka Enberg

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=20080813174016.b0a317e3.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=cl@linux-foundation.org \
    --cc=eduard.munteanu@linux360.ro \
    --cc=linux-next@vger.kernel.org \
    --cc=penberg@cs.helsinki.fi \
    --cc=randy.dunlap@oracle.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox