df1b98
Merge branch 'users/jroedel/fixes/linux-4.12/for-next' into fixes/linux-4.12 Pull assorted fixes from Joerg Roedel. Conflicts: blacklist.conf