On Mon, Dec 12, 2016 at 08:27:33AM +0100, Ingo Molnar wrote: > > * Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote: > > > On Sun, Dec 04, 2016 at 03:35:55PM +0100, Lukas Wunner wrote: > > > This struct never needs to be modified. The size of pci-mid.o ELF > > > sections changes thusly: > > > > > > -.data 56 > > > +.data 0 > > > -.rodata 32 > > > +.rodata 88 > > > > > > Acked-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> > > > Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > > > Signed-off-by: Lukas Wunner <lukas@xxxxxxxxx> > > > > Ingo, do you want this, since you've taken the previous updates? > > > > It's trivial but doesn't apply cleanly to my tree, which makes me think > > it might be based on other changes I don't have. > > It applies to upstream v4.9 cleanly, so I guess it's due to other changes you have > in your tree? > > Could you take it? Me having dabbled in drivers/pci/ is more of an outlier. Applied to pci/pm for v4.10. It didn't apply cleanly to v4.9-rc1, which is what my v4.10 branches are based on. It applies cleanly on e8a6123e9ead ("x86/platform/intel-mid: Retrofit pci_platform_pm_ops ->get_state hook"), which was not in v4.9-rc1 but was merged via x86-urgent-for-linus (8528d662489a). I can't remember why we decided to put pci-mid.c in drivers/pci. The obviously reason is that it uses pci_platform_pm_ops, which isn't visible outside drivers/pci, but pci-mid.c is clearly platform- specific, and even the name "pci_platform_pm_ops" sounds like something that should be implemented in the arch directories, so maybe pci_platform_pm_ops should be moved to include/linux/pci.h. I have strange sense of déjà vu writing this, so sorry if I'm repeating something. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html