From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Pekka Enberg <penberg@cs.helsinki.fi>,
Vegard Nossum <vegard.nossum@gmail.com>
Subject: Re: linux-next: manual merge of the iommu tree with the kmemcheck/x86 trees
Date: Thu, 19 Mar 2009 09:43:43 +0100 [thread overview]
Message-ID: <20090319084343.GA9038@elte.hu> (raw)
In-Reply-To: <20090319193903.eb51e389.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Thu, 19 Mar 2009 19:06:53 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
> This is, of course how it was fixed in tip/master as well.
yeah. This file is a common source of conflicts - eventually we will
sort those kconfig variables alphabetically to reduce the chance of
interaction.
Ingo
prev parent reply other threads:[~2009-03-19 8:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-19 8:06 linux-next: manual merge of the iommu tree with the kmemcheck/x86 trees Stephen Rothwell
2009-03-19 8:39 ` Stephen Rothwell
2009-03-19 8:43 ` Ingo Molnar [this message]
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=20090319084343.GA9038@elte.hu \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=penberg@cs.helsinki.fi \
--cc=sfr@canb.auug.org.au \
--cc=vegard.nossum@gmail.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;
as well as URLs for NNTP newsgroup(s).