From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jeremy Fitzhardinge <jeremy@goop•org>,
Xen Devel <Xen-devel@lists•xensource.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Gianluca Guida <gianluca.guida@citrix•com>,
Yinghai Lu <yinghai@kernel•org>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Subject: linux-next: manual merge of the xen tree with the tip tree
Date: Fri, 22 Oct 2010 14:03:35 +1100 [thread overview]
Message-ID: <20101022140335.c4a3a48f.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 720 bytes --]
Hi all,
Today's linux-next merge of the xen tree got a conflict in
arch/x86/mm/init_32.c between commit
1d931264af0f10649b35afa8fbd2e169da51ac08 ("x86-32, memblock: Make
add_highpages honor early reserved ranges") from the tip tree and commit
07147a06ac3b1b028124ea00ba44e69eb8ea7685 ("x86/32: honor reservations of
high memory") from the xen tree.
I have no idea how to fix this up, sorry, so I have used the xen tree
from next-20101021 for today.
There were also conflicts in:
arch/x86/xen/mmu.c
include/linux/early_res.h
kernel/early_res.c
These last two were deleted in the tip tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-10-22 3:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-22 3:03 Stephen Rothwell [this message]
2010-10-22 3:36 ` linux-next: manual merge of the xen tree with the tip tree Stephen Rothwell
2010-10-22 4:03 ` Yinghai Lu
2010-10-22 8:01 ` Ingo Molnar
2010-10-22 18:39 ` Jeremy Fitzhardinge
2010-10-22 21:32 ` [Xen-devel] " Stefano Stabellini
2010-10-22 19:10 ` Jeremy Fitzhardinge
-- strict thread matches above, loose matches on Subject: below --
2011-08-25 4:24 Stephen Rothwell
2011-08-25 18:13 ` Jeremy Fitzhardinge
2011-08-25 18:26 ` H. Peter Anvin
2011-08-25 23:06 ` Stephen Rothwell
2011-08-25 23:12 ` H. Peter Anvin
2011-08-26 2:54 ` Stephen Rothwell
2011-09-13 11:11 ` Stephen Rothwell
2011-09-13 15:07 ` Thomas Gleixner
2011-09-13 20:53 ` Jeremy Fitzhardinge
2011-09-13 20:56 ` Thomas Gleixner
2011-09-13 21:00 ` Jeremy Fitzhardinge
2011-09-14 0:32 ` Stephen Rothwell
2011-09-14 0:41 ` Jeremy Fitzhardinge
2011-09-14 0:48 ` 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=20101022140335.c4a3a48f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=gianluca.guida@citrix$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jeremy@goop$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=yinghai@kernel$(echo .)org \
/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