)]}'
{
  "commit": "520045db940a381d2bee1c1b2179f7921b40fb10",
  "tree": "1dab17add9c5d73e57cbc526884b4c6b4a4d4cd9",
  "parents": [
    "426e1f5cec4821945642230218876b0e89aafab1",
    "9387377eb79a44f453fd27c3d00a2e5da587e369",
    "45263cb0993de738e158c625c84a5feb18bed317"
  ],
  "author": {
    "name": "Linus Torvalds",
    "email": "torvalds@linux-foundation.org",
    "time": "Tue Oct 26 18:20:19 2010 -0700"
  },
  "committer": {
    "name": "Linus Torvalds",
    "email": "torvalds@linux-foundation.org",
    "time": "Tue Oct 26 18:20:19 2010 -0700"
  },
  "message": "Merge branches \u0027upstream/xenfs\u0027 and \u0027upstream/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n\n* \u0027upstream/xenfs\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:\n  xen/privcmd: make privcmd visible in domU\n  xen/privcmd: move remap_domain_mfn_range() to core xen code and export.\n  privcmd: MMAPBATCH: Fix error handling/reporting\n  xenbus: export xen_store_interface for xenfs\n  xen/privcmd: make sure vma is ours before doing anything to it\n  xen/privcmd: print SIGBUS faults\n  xen/xenfs: set_page_dirty is supposed to return true if it dirties\n  xen/privcmd: create address space to allow writable mmaps\n  xen: add privcmd driver\n  xen: add variable hypercall caller\n  xen: add xen_set_domain_pte()\n  xen: add /proc/xen/xsd_{kva,port} to xenfs\n\n* \u0027upstream/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (29 commits)\n  xen: include xen/xen.h for definition of xen_initial_domain()\n  xen: use host E820 map for dom0\n  xen: correctly rebuild mfn list list after migration.\n  xen: improvements to VIRQ_DEBUG output\n  xen: set up IRQ before binding virq to evtchn\n  xen: ensure that all event channels start off bound to VCPU 0\n  xen/hvc: only notify if we actually sent something\n  xen: don\u0027t add extra_pages for RAM after mem_end\n  xen: add support for PAT\n  xen: make sure xen_max_p2m_pfn is up to date\n  xen: limit extra memory to a certain ratio of base\n  xen: add extra pages for E820 RAM regions, even if beyond mem_end\n  xen: make sure xen_extra_mem_start is beyond all non-RAM e820\n  xen: implement \"extra\" memory to reserve space for pages not present at boot\n  xen: Use host-provided E820 map\n  xen: don\u0027t map missing memory\n  xen: defer building p2m mfn structures until kernel is mapped\n  xen: add return value to set_phys_to_machine()\n  xen: convert p2m to a 3 level tree\n  xen: make install_p2mtop_page() static\n  ...\n\nFix up trivial conflict in arch/x86/xen/mmu.c, and fix the use of\n\u0027reserve_early()\u0027 - in the new memblock world order it is now\n\u0027memblock_x86_reserve_range()\u0027 instead. Pointed out by Jeremy.\n",
  "tree_diff": []
}