# git rev-parse -q --verify 12566cc35d0e68308bde7aad615743d560cb097b^{commit} 12566cc35d0e68308bde7aad615743d560cb097b already have revision, skipping fetch # git checkout -q -f -B kisskb 12566cc35d0e68308bde7aad615743d560cb097b # git clean -qxdf # git log -1 commit 12566cc35d0e68308bde7aad615743d560cb097b Merge: 95d0c42 67e6587 Author: Linus Torvalds Date: Mon Apr 18 19:52:47 2016 -0700 Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci Pull PCI fixes from Bjorn Helgaas: "These are fixes for two issues: - The VPD parsing code we added for v4.6 keeps some devices from crashing, but also keeps cxgb4 from reading non-standard extra VPD data that is relies on. Hariprasad added a way for the driver to specify how much VPD is valid. - The i.MX6 active-low reset GPIO support we added in v4.5 caused regressions on some boards, so we're reverting that. VPD: Add pci_set_vpd_size() (Hariprasad Shenai) cxgb4: Set VPD size so we can read both VPD structures (Hariprasad Shenai) Freescale i.MX6 host bridge driver: Revert "PCI: imx6: Add support for active-low reset GPIO" (Fabio Estevam)" * tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: cxgb4: Set VPD size so we can read both VPD structures PCI: Add pci_set_vpd_size() to set VPD size Revert "PCI: imx6: Add support for active-low reset GPIO" # < /opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi-gcc --version # < git log --format=%s --max-count=1 12566cc35d0e68308bde7aad615743d560cb097b # < make -j 8 ARCH=arm O=/home/kisskb/slave/build/linus_realview-smp_defconfig_arm CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- realview-smp_defconfig make[2]: *** [realview-smp_defconfig] Error 1 make[1]: *** [realview-smp_defconfig] Error 2 make: *** [sub-make] Error 2 Command 'make -j 8 ARCH=arm O=/home/kisskb/slave/build/linus_realview-smp_defconfig_arm CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- realview-smp_defconfig' returned non-zero exit status 2 # rm -rf /home/kisskb/slave/build/linus_realview-smp_defconfig_arm # Build took: 0:00:02.362199