public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Borislav Petkov <borislav.petkov@amd•com>
Cc: Borislav Petkov <petkovbb@googlemail•com>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Rusty Russell <rusty@rustcorp•com.au>,
	Andreas Herrmann <andreas.herrmann3@amd•com>
Subject: Re: linux-next: manual merge of the edac-amd tree with the rr tree
Date: Fri, 31 Jul 2009 12:01:46 +1000	[thread overview]
Message-ID: <20090731120146.00980017.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20090730110938.GA16659@aftab>

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

Hi Boris,

On Thu, 30 Jul 2009 13:09:39 +0200 Borislav Petkov <borislav.petkov@amd•com> wrote:
>
> I rediffed the topology bits against
> cpumask:remove-topology_core_siblings-and-topology_thread_siblings-core.
> patch from Rusty's tree so we should be good to go.

Thanks.

> Also, I'm carrying couple of patches that should go through the x86 tree
> and depending on when they go in, I'll drop them from mine. Just wanted
> to give you heads up here in case you start getting merge conflicts :).

OK

-- 
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:[~2009-07-31  2:01 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-30  5:41 linux-next: manual merge of the edac-amd tree with the rr tree Stephen Rothwell
2009-07-30  6:23 ` Borislav Petkov
2009-07-30  7:08   ` Stephen Rothwell
2009-07-30 11:09     ` Borislav Petkov
2009-07-31  2:01       ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-08-06  7:51 Stephen Rothwell
2009-08-06  8:07 ` Borislav Petkov
2009-11-19  5:23 Stephen Rothwell
2009-11-19  6:06 ` Borislav Petkov
2009-11-19  6:56   ` Rusty Russell

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=20090731120146.00980017.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=andreas.herrmann3@amd$(echo .)com \
    --cc=borislav.petkov@amd$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=petkovbb@googlemail$(echo .)com \
    --cc=rusty@rustcorp$(echo .)com.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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