From: Ingo Molnar <mingo@elte•hu>
To: Pekka Enberg <penberg@cs•helsinki.fi>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Vegard Nossum <vegard.nossum@gmail•com>,
linux-next@vger•kernel.org, Nick Piggin <npiggin@suse•de>
Subject: Re: linux-next: manual merge of the kmemcheck tree with the x86 tree
Date: Fri, 23 Jan 2009 16:53:40 +0100 [thread overview]
Message-ID: <20090123155340.GC16064@elte.hu> (raw)
In-Reply-To: <1232720514.6094.61.camel@penberg-laptop>
* Pekka Enberg <penberg@cs•helsinki.fi> wrote:
> Hi Stephen,
>
> On Fri, 2009-01-23 at 15:44 +1100, Stephen Rothwell wrote:
> > Today's linux-next merge of the kmemcheck tree got a conflict in
> > arch/x86/mm/fault.c between commit do_page_fault ("x86: optimise x86's
> > do_page_fault (C entry point for the page fault path)") from the x86 tree
> > and commit 787ecfaa503dc63ff1831ddc74b15dad49bace1d ("x86: add hooks for
> > kmemcheck") from the kmemcheck tree.
> >
> > I fixed it up (see below) but it is worth a check. I can carry the fix
> > as necessary.
>
> Looks good to me. Vegard?
it's resolved in tip/master already.
Stephen, could you please only report conflict resolutions that you do if
they differ from the one done in tip/master? Or use tip/auto-latest that
has all these conflict resolutions integrated into a single package.
A lot of internal conflicts between -tip originated trees get reported
again and again as genuine conflicts - needlessly in 99% of the cases as
i've already done the conflict resolution myself days (sometimes weeks)
ahead of the linux-next resolution, and tested the end result in
tip/master.
Ingo
next prev parent reply other threads:[~2009-01-23 15:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-23 4:44 linux-next: manual merge of the kmemcheck tree with the x86 tree Stephen Rothwell
2009-01-23 14:21 ` Pekka Enberg
2009-01-23 15:53 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-03-06 6:04 Stephen Rothwell
2009-03-06 6:19 Stephen Rothwell
2009-03-06 6:24 Stephen Rothwell
2009-03-19 7:49 Stephen Rothwell
2009-06-01 7:55 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=20090123155340.GC16064@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=npiggin@suse$(echo .)de \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=vegard.nossum@gmail$(echo .)com \
/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