Included patches from Bjorn. I had already started my own equivalent patches, but it will be easier for Bjorn to sign off if he wrote them. Moved the bug fix to the end of the series, in case we accept Logan's equivalent patch instead - in which case, the last patch in my series can easily be dropped. I split the [previously 2/4] patch into two, in the hope it can make things easier. We are running out of time and do not have high hopes of hitting this merge window, other than perhaps Bjorn's 1-2 and my 3 which solves Mika Westerberg's bug. That would be a win for me, and would make things easier next cycle. Hopefully I addressed as many of the concerns raised as possible with this series. There was no response so I went with kernel parameters hpmmiosize and hpmmioprefsize which fits in with hpiosize. The existing hpmemsize remains unchanged. I still have no idea why my git send-email is messing with the encoding, when it works for everybody else - but I will use "mutt -H" in the mean time, which we tested to be working. I have tried to test this as extensively as I can but I fear I may have left silly mistakes, or forgotten to make all of the requested changes. My apologies in advance if any slip through. Bjorn Helgaas (2): PCI: Simplify pci_bus_distribute_available_resources() PCI: Skip resource distribution when no hotplug bridges Nicholas Johnson (5): PCI: Consider alignment of hot-added bridges when distributing available resources PCI: Allow extend_bridge_window() to shrink resource if necessary PCI: Change extend_bridge_window() to set resource size directly PCI: Add hp_mmio_size and hp_mmio_pref_size parameters PCI: Fix bug resulting in double hpmemsize being assigned to MMIO window .../admin-guide/kernel-parameters.txt | 8 +- drivers/pci/pci.c | 17 +- drivers/pci/setup-bus.c | 247 +++++++++--------- include/linux/pci.h | 3 +- 4 files changed, 150 insertions(+), 125 deletions(-) -- 2.20.1