29f4f1
Merge remote-tracking branch 'origin/SLE12-SP4' into SLE12-SP5 Conflicts: patches.suse/net-smc-add-fallback-check-to-connect series.conf