Merge branch 'kbuild/kconfig' into kbuild/for-next

diff --git a/scripts/config b/scripts/config
index 2283be2bb62c067d3d318431d1071328a7d649fb..68041793698c5f22099782129b03c81b8b4bca54 100755 (executable)
--- a/scripts/config
+++ b/scripts/config
@@ -82,7 +82,7 @@ txt_subst() {
        local infile="$3"
        local tmpfile="$infile.swp"
 
-       sed -e "s/$before/$after/" "$infile" >"$tmpfile"
+       sed -e "s:$before:$after:" "$infile" >"$tmpfile"
        # replace original file with the edited one
        mv "$tmpfile" "$infile"
 }