d2ef4b
Merge remote-tracking branch 'origin/SLE12-SP5_EMBARGO' into SLE12-SP5 Conflicts: patches.suse/nfsd-Fix-error-cleanup-path-in-nfsd_rename.patch series.conf