5ae966
Merge branch 'users/lduncan/fixes/linux-4.12/for-next' into fixes/linux-4.12 Pull scsi fixes from Lee Duncan. Conflicts: blacklist.conf