Merge changes from topic "fix_checkpatch_merges" into integration

* changes:
  fix(plat/st): remove double space
  fix(checkpatch): do not check merge commits

Makefile

@@ -1318,7 +1318,8 @@ checkpatch:		locate-checkpatch
 		echo "    with ${CHECKPATCH_OPTS} option(s)";		\
 	fi
 	${Q}COMMON_COMMIT=$$(git merge-base HEAD ${BASE_COMMIT});	\
-	for commit in `git rev-list $$COMMON_COMMIT..HEAD`; do		\
+	for commit in `git rev-list --no-merges $$COMMON_COMMIT..HEAD`;	\
+	do								\
 		printf "\n[*] Checking style of '$$commit'\n\n";	\
 		git log --format=email "$$commit~..$$commit"		\
 			-- ${CHECK_PATHS} |				\

plat/st/common/stm32cubeprogrammer_usb.c

@@ -116,7 +116,7 @@ static int dfu_callback_download(uint8_t alt, uintptr_t *buffer, uint32_t *len,
 	dfu->address += *len;
 
 	if (dfu->address - dfu->base > dfu->len) {
-		return  -EIO;
+		return -EIO;
 	}
 
 	return 0;