c7ef83
Merge branch 'users/msuchanek/SLE12-SP5/for-next' into SLE12-SP5 Fix conflicts in blacklist.conf and series.conf