| Date | Fri, 4 Jan 2013 13:44:56 -0800 | Subject | Re: [PATCH v7u1 00/31] x86, boot, 64bit: Add support for loading ramdisk and bzImage above 4G | From | Yinghai Lu <> |
| |
On Thu, Jan 3, 2013 at 11:09 PM, Borislav Petkov <bp@alien8.de> wrote: > On Thu, Jan 03, 2013 at 04:48:20PM -0800, Yinghai Lu wrote: > >> git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.git for-x86-boot >> >> and it is on top of linus's tree 2013-01-03 >> plus tip:x86/mm, tip:x86/mm2 > > This is causing a merge conflict when merging tip:x86/mm2 > after having merged tip:x86/mm ontop of -rc2+ (today's Linus' > tree) in mm/nobootmem.c. free_all_bootmem_node has gained a > reset_node_lowmem_managed_pages() call which got added in > 9feedc9d831e18ae6d0d15aa562e5e46ba53647b. > > Now, you have a patch in tip:x86/mm2 which kills that > free_all_bootmem_node() function but the commit above adds that > reset_node_lowmem_managed_pages() call to it. > > A proper merge conflict resolve would need to be added to the pull > request which sends tip:x86/mm2 upstream and then you'd need to rebase > your stuff ontop. Or something better which I'm not thinking of right > now...
Peter or Linus could figure it out.
|