From: Tejun Heo <tj@kernel.org>
To: benh@kernel.crashing.org, yinghai@kernel.org, hpa@zytor.com,
ralf@linux-mips.org, schwidefsky@de.ibm.com,
liqin.chen@sunplusct.com, lethal@linux-sh.org,
davem@davemloft.net, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org
Subject: [GIT PULL tip/x86/memblock] updated x86/memblock branch
Date: Mon, 28 Nov 2011 10:22:06 -0800 [thread overview]
Message-ID: <20111128182206.GF18864@google.com> (raw)
Hello, Ingo, hpa,
For some reason (probably the korg issue played a role), x86/memblock
got dropped from tip and missed the merge window and I didn't notice
it either until benh poke me about testing pending patches (thanks a
lot). I resurrected the branch and there are some conflicts as
expected but nothing major.
I pulled in the current linux/master 401d0069cb "Merge branch
'fbdev-for-linus' of git://github.com/schandinat/linux-2.6" into
x86/memblock and resolve all the conflicts. List of conflicts and
resolutions follow (also included in the commit message).
* arch/x86/xen/setup.c
dc91c728fd "xen: allow extra memory to be in multiple regions"
24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..."
conflicted on xen_add_extra_mem() updates. The resolution is
trivial as the latter just want to replace
memblock_x86_reserve_range() with memblock_reserve().
* drivers/pci/intel-iommu.c
166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/"
5dfe8660a3d "bootmem: Replace work_with_active_regions() with..."
conflicted as the former moved the file under drivers/iommu/.
Resolved by applying the chnages from the latter on the moved
file.
* mm/Kconfig
6661672053a "memblock: add NO_BOOTMEM config symbol"
c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option"
conflicted trivially. Both added config options. Just
letting both add their own options resolves the conflict.
* mm/memblock.c
d1f0ece6cdc "mm/memblock.c: small function definition fixes"
ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()"
confliected. The former updates function removed by the
latter. Resolution is trivial.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git x86-memblock
to receive the merged branch. I'll soon post the pending patches on
top of the merged branch.
Thank you.
--
tejun
reply other threads:[~2011-11-28 18:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20111128182206.GF18864@google.com \
--to=tj@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=lethal@linux-sh.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liqin.chen@sunplusct.com \
--cc=ralf@linux-mips.org \
--cc=schwidefsky@de.ibm.com \
--cc=yinghai@kernel.org \
/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).