From: Linus Torvalds Date: Thu, 27 Oct 2016 17:07:13 +0000 (-0700) Subject: Merge branch 'for-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... X-Git-Tag: v4.9-rc3~34 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=4a3c390c384f31c60aaf0502dcd3d790a9ebebca Merge branch 'for-4.9-fixes' of git://git./linux/kernel/git/tj/libata Pull libata fixes from Tejun Heo: "The AHCI MSI handling change in rc1 was a bit broken and caused disk probing failures on some machines. These three patches should fix the issues" David Howells comments: "My test machine fell foul of this using a PCIe M.2-attached SSD card. The patches fix it for me" * 'for-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: ahci: fix the single MSI-X case in ahci_init_one ahci: fix nvec check ahci: only try to use multi-MSI mode if there is more than 1 port --- 4a3c390c384f31c60aaf0502dcd3d790a9ebebca