From: Jeremy Fitzhardinge <jeremy@goop•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the tip-core tree
Date: Tue, 24 Jun 2008 23:51:10 -0400 [thread overview]
Message-ID: <4861C0AE.4080809@goop.org> (raw)
In-Reply-To: <20080625104928.d26f77fe.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip-core tree got a trivial context
> conflicts in arch/x86/xen/enlighten.c, arch/x86/xen/mmu.c and
> arch/x86/xen/mmu.h between commit
> 28499143933f19b28008a556ed59255d6009391a ("xen: remove support for
> non-PAE 32-bit") from Linus' tree (and also exists in the tip-core tree)
> and commit e2426cf85f8db5891fb5831323d2d0c176c4dadc ("xen: avoid
> hypercalls when updating unpinned pud/pmd") from the tip-core tree.
>
> I fixed it up and will carry the fixup.
>
>
Great thanks.
J
next prev parent reply other threads:[~2008-06-25 3:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-25 0:49 linux-next: manual merge of the tip-core tree Stephen Rothwell
2008-06-25 3:51 ` Jeremy Fitzhardinge [this message]
2008-06-25 9:17 ` Ingo Molnar
2008-06-25 16:13 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-07-07 3:15 Stephen Rothwell
2008-07-07 6:12 ` Ingo Molnar
2008-07-07 6:39 ` Stephen Rothwell
2008-07-08 0:16 Stephen Rothwell
2008-08-04 1:08 Stephen Rothwell
2008-10-14 4:23 Stephen Rothwell
2008-10-14 4:24 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=4861C0AE.4080809@goop.org \
--to=jeremy@goop$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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