Re: [Xen-devel] Re: 2.6.39 merge window - git pulls and what went in.

[Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>]

> Some thing is amiss. Anyway, I rebased my patches to linus's tree
> (master) and it
> still applies cleanly AFAICT. Konrad is pulling it now.

And Linus applied most of the patches (yeey!). Thank you everybody!

I believe we only have these bug-fixes left:

Stefano Stabellini (3):
      xen: set max_pfn_mapped to the last pfn mapped
      xen: update mask_rw_pte after kernel page tables init changes
      acpiphp: set current_state to D0 in register_slot

Yinghai Lu (1):
      x86: Cleanup highmap after brk is concluded

Ian Campbell (1):
      acpiphp: assume device is in state D0 after powering on a slot.


I tried to apply Yinghai Lu's patch on top of linus/master today but
found that the cleanup_highmap had now been split in two different functions:
cleanup_highmap and cleanup_highmap_brk_end.

Is there a need to rebase those patches?

Here is the glory list of what is in 2.6.39-rc0 right now:
(git shortlog --grep="Xen" --grep="xen" v2.6.38..linus/master | grep -v netxen)

Alexander van Heukelum (1):
      x86, binutils, xen: Fix another wrong size directive

Daniel De Graaf (16):
      xen-gntdev: Change page limit to be global instead of per-open
      xen-gntdev: Use find_vma rather than iterating our vma list manually
      xen-gntdev: Add reference counting to maps
      xen-gntdev: Support mapping in HVM domains
      xen-gntalloc: Userspace grant allocation driver
      xen/gntalloc,gntdev: Add unmap notify ioctl
      xen-gntdev: Fix memory leak when mmap fails
      xen-gntdev: Fix unmap notify on PV domains
      xen-gntdev: Use map->vma for checking map validity
      xen-gntdev: Avoid unmapping ranges twice
      xen-gntdev: Avoid double-mapping memory
      xen-gntdev: prevent using UNMAP_NOTIFY_CLEAR_BYTE on read-only mappings
      xen-gntdev: Fix incorrect use of zero handle
      xen-gntdev: Add cast to pointer
      xen-balloon: Move core balloon functionality out of module
      xen-gntdev: Use ballooned pages for grant mappings

Daniel Kiper (3):
      xen/balloon: Removal of driver_pages
      xen/balloon: Migration from mod_timer() to schedule_delayed_work()
      xen/balloon: Protect against CPU exhaust by event/x process

Dave Airlie (1):
      Merge branch 'stable/ttm.pci-api.v5' of 
git://git.kernel.org/.../konrad/xen into drm-next

David S. Miller (1):
      Merge branch 'stable/backends' of git://git.kernel.org/.../konrad/xen

Eric Dumazet (1):
      xen: netfront: fix xennet_get_ethtool_stats()

Ian Campbell (55):
      xen: events: mark cpu_evtchn_mask_p as __refdata
      xen p2m: annotate variable which appears unused
      xen: annotate functions which only call into __init at start of day
      xen: do not respond to unknown xenstore control requests
      xen: use new schedop interface for suspend
      xen: switch to new schedop hypercall by default.
      xen: suspend: use HYPERVISOR_suspend for PVHVM case instead of open coding
      xen: suspend: refactor cancellation flag into a structure
      xen: suspend: pass extra hypercall argument via suspend_info struct
      xen: suspend: add "arch" to pre/post suspend hooks
      xen: suspend: refactor non-arch specific pre/post suspend hooks
      xen: suspend: move arch specific pre/post suspend hooks into generic hooks
      xen: suspend: pull pre/post suspend hooks out into suspend_info
      xen: suspend: remove xen_hvm_suspend
      xen/irq: implement bind_interdomain_evtchn_to_irqhandler for backend 
drivers
      xen: ia64 build broken due to "xen: switch to new schedop hypercall by 
default."
      xen: handled remapped IRQs when enabling a pcifront PCI device.
      xen:events: move find_unbound_irq inside CONFIG_PCI_MSI
      xen: events: add xen_allocate_irq_{dynamic, gsi} and xen_free_irq
      xen: events: allocate GSIs and dynamic IRQs from separate IRQ ranges.
      xen: events: do not free legacy IRQs
      xen: Fix compile error introduced by "switch to new irq_chip functions"
      xen/timer: Missing IRQF_NO_SUSPEND in timer code broke suspend.
      xen/p2m/m2p/gnttab: do not add failed grant maps to m2p override
      xen: gntdev: fix build warning
      xen: pci: only define xen_initdom_setup_msi_irqs if CONFIG_XEN_DOM0
      xen: events: do not leak IRQ from xen_allocate_pirq_msi when no pirq 
available.
      xen: events: drop XEN_ALLOC_IRQ flag to xen_allocate_pirq_msi
      xen: events: return irq from xen_allocate_pirq_msi
      xen: pci: collapse apic_register_gsi_xen_hvm and xen_hvm_register_pirq
      xen: events: assume PHYSDEVOP_get_free_pirq exists
      xen: events: separate MSI PIRQ allocation from PIRQ binding to IRQ
      xen: events: refactor xen_create_msi_irq slightly
      xen: events: update pirq_to_irq in xen_create_msi_irq
      xen: events: push set_irq_msi down into xen_create_msi_irq
      xen: events: use xen_bind_pirq_msi_to_irq from xen_create_msi_irq
      xen: events: remove dom0 specific xen_create_msi_irq
      xen: events: Make last processed event channel a per-cpu variable.
      xen: events: separate two unrelated halves of if condition
      xen: events: simplify comment
      xen: events: fix xen_map_pirq_gsi error return
      xen: events: remove unused public functions
      xen: events: rename restore_cpu_pirqs -> restore_pirqs
      xen: events: refactor GSI pirq bindings functions
      xen: events: use per-cpu variable for cpu_evtchn_mask
      xen: events: turn irq_info constructors into initialiser functions
      xen: events: push setup of irq<->{evtchn,ipi,virq,pirq} maps into 
irq_info init functions
      xen: events: maintain a list of Xen interrupts
      xen: events: dynamically allocate irq info structures
      xen: events: remove use of nr_irqs as upper bound on number of pirqs
      xen: events: do not workaround too-small nr_irqs
      xen: events: propagate irq allocation failure instead of panicking
      xen: events: correct locking in xen_irq_from_pirq
      xen: netfront: ethtool stats fields should be unsigned long
      xen network backend driver

Jan Beulich (1):
      watchdog: Xen watchdog driver

Javi Merino (1):
      kref: Fix typo in kref documentation

Kazuhiro SUZUKI (1):
      xen: xenbus PM events support

Keir Fraser (3):
      xen: events: Clean up round-robin evtchn scan.
      xen: events: Make round-robin scan fairer by snapshotting each l2 word 
once only
      xen: events: Remove redundant clear of l2i at end of round-robin loop

Konrad Rzeszutek Wilk (22):
      ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set.
      xen-pcifront: Sanity check the MSI/MSI-X values
      pci/xen: Use xen_allocate_pirq_msi instead of xen_allocate_pirq
      pci/xen: Cleanup: convert int** to int[]
      pci/xen: When free-ing MSI-X/MSI irq->desc also use generic code.
      xen: Mark all initial reserved pages for the balloon as INVALID_P2M_ENTRY.
      Merge branch 'irq/for-xen' of git://git.kernel.org/.../tip/linux-2.6-tip 
into HEAD
      xen/irq: Cleanup up the pirq_to_irq for DomU PV PCI passthrough guests as 
well.
      xen/hvc: Disable probe_irq_on/off from poking the hvc-console IRQ line.
      Merge branch 'stable/irq.rework' into stable/irq.cleanup
      Merge branch 'stable/pcifront-fixes' into stable/irq.cleanup
      xen/e820: Don't mark balloon memory as E820_UNUSABLE when running as 
guest and fix overflow.
      xen/mmu: Add the notion of identity (1-1) mapping.
      xen/mmu: Set _PAGE_IOMAP if PFN is an identity PFN.
      xen/mmu: WARN_ON when racing to swap middle leaf.
      xen/setup: Set identity mapping for non-RAM E820 and E820 gaps.
      xen/debugfs: Add 'p2m' file for printing out the P2M layout.
      xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set.
      xen/m2p: No need to catch exceptions when we know that there is no RAM
      xen: events: Fix compile error if CONFIG_SMP is not defined.
      xen/balloon: Remove pr_info's and don't alter retry_count
      xen-balloon: Add interface to retrieve ballooned pages

Linus Torvalds (12):
      Merge branches 'stable/p2m-identity.v4.9.1' and 'stable/e820' of 
git://git.kernel.org/.../konrad/xen
      Merge branches 'stable/irq.rework' and 'stable/pcifront-fixes' of 
git://git.kernel.org/.../konrad/xen
      Merge branch 'stable/irq.cleanup' of git://git.kernel.org/.../konrad/xen
      Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 
'stable/cleanup' of git://git.kernel.org/.../konrad/xen
      Merge branch 'for-linus' of 
git://xenbits.xen.org/people/sstabellini/linux-pvhvm
      Merge branch 'x86-asm-for-linus' of 
git://git.kernel.org/.../tip/linux-2.6-tip
      Merge branch 'irq-core-for-linus' of 
git://git.kernel.org/.../tip/linux-2.6-tip
      Merge git://git.kernel.org/.../davem/net-next-2.6
      Merge git://git.kernel.org/.../wim/linux-2.6-watchdog
      Merge branches 'stable/hvc-console', 'stable/gntalloc.v6' and 
'stable/balloon' of git://git.kernel.org/.../konrad/xen
      Merge branches 'stable/irq.fairness' and 'stable/irq.ween_of_nr_irqs' of 
git://git.kernel.org/.../konrad/xen
      Merge branch 'stable/xen.pm.bug-fixes' of 
git://git.kernel.org/.../konrad/xen

Owen Smith (1):
      xen: Union the blkif_request request specific fields

Scott Rixner (1):
      xen: events: Process event channels notifications in round-robin order.

Shriram Rajagopalan (1):
      xen: use freeze/restore/thaw PM events for suspend/resume/chkpt

Sony Chacko (2):

Stefano Stabellini (8):
      xen: change xen/[gntdev/gntalloc] to default m
      xen: no need to delay xen_setup_shutdown_event for hvm guests anymore
      xen: do not use xen_info on HVM, set pv_info name to "Xen HVM"
      xen-blkfront: handle Xen major numbers other than XENVBD
      xen: make the ballon driver work for hvm domains
      xen: PV on HVM: support PV spinlocks and IPIs
      xen: fix compile issue if XEN is enabled but XEN_PVHVM is disabled
      xen/m2p: Check whether the MFN has IDENTITY_FRAME bit set..

Tejun Heo (1):
      xen-pcifront: don't use flush_scheduled_work()

Thomas Gleixner (6):
      genirq: Add IRQF_FORCE_RESUME
      Merge branch 'irq/for-xen' into irq/core
      genirq: Make nr_irqs runtime expandable
      xen: Remove stale irq_chip.end
      xen: Switch to new irq_chip functions
      xen: Use IRQF_FORCE_RESUME

Yin Kangkai (1):
      serial-core: reset the console speed on resume

Zhang, Fengzhe (1):
      xen/setup: Inhibit resource API from using System RAM E820 gaps as PCI 
mem gaps.


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel