Merge busybox into merge

Fix merge conflict in miscutils/less.c.

Use exit_SUCCESS() where possible.

1 files changed, 1 insertions, 1 deletions

diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index db44a2ed0..b61651621 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -415,7 +415,7 @@ static FAST_FUNC int fileAction(struct recursive_state *state,
                         /* Load was successful, there is nothing else to do.
                          * This can happen ONLY for "top-level" module load,
                          * not a dep, because deps don't do dirscan. */
-                        exit(EXIT_SUCCESS);
+                        exit_SUCCESS();
                 }
         }