From: Linus Torvalds Date: Thu, 12 Mar 2015 16:45:46 +0000 (-0700) Subject: Merge tag 'pci-v4.0-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci X-Git-Tag: v5.15~16174 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=91e9134eda82b57952fdbdb0c5990a7a6609ff13;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'pci-v4.0-fixes-2' of git://git./linux/kernel/git/helgaas/pci Pull PCI fixes from Bjorn Helgaas: "Here are a couple updates for v4.0. One fixes a config accessor problem on APM X-Gene that we introduced when switching to generic config accessors, and the other fixes an older read-past-end-of-buffer problem in sysfs. APM X-Gene host bridge driver - Add register offset to config space base address (Feng Kan) Miscellaneous - Don't read past the end of sysfs "driver_override" buffer (Sasha Levin)" * tag 'pci-v4.0-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: xgene: Add register offset to config space base address PCI: Don't read past the end of sysfs "driver_override" buffer --- 91e9134eda82b57952fdbdb0c5990a7a6609ff13