diff --git a/meta-selftest/recipes-test/govendor/go-vendor-src-uri_1.0.bb b/meta-selftest/recipes-test/govendor/go-vendor-src-uri_1.0.bb
index 6f0364b7dae..481aca71ea1 100644
--- a/meta-selftest/recipes-test/govendor/go-vendor-src-uri_1.0.bb
+++ b/meta-selftest/recipes-test/govendor/go-vendor-src-uri_1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Selftest fixture: go_src_uri parameter variants"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" 
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 # Parsed via tinfoil for its GO_SRC_URI_* variables only; never actually built
 # (it has no real SRC_URI, so do_go_vendor would fail).
diff --git a/meta-selftest/recipes-test/postinst/postinst_1.0.bb b/meta-selftest/recipes-test/postinst/postinst_1.0.bb
index b936c4f44be..27ed201365e 100644
--- a/meta-selftest/recipes-test/postinst/postinst_1.0.bb
+++ b/meta-selftest/recipes-test/postinst/postinst_1.0.bb
@@ -60,7 +60,7 @@ pkg_postinst_ontarget:${PN}-delayed-b () {
     touch ${TESTDIR}/delayed-b
 }
 
-# This scriptlet intentionally includes a bogus command in the middle to test 
+# This scriptlet intentionally includes a bogus command in the middle to test
 # that we catch and report such errors properly.
 pkg_postinst:${PN}-rootfs-failing () {
     mkdir -p $D${TESTDIR}
diff --git a/meta/classes/go-vendor.bbclass b/meta/classes/go-vendor.bbclass
index 5bb4e8e876a..538b7cec67e 100644
--- a/meta/classes/go-vendor.bbclass
+++ b/meta/classes/go-vendor.bbclass
@@ -5,14 +5,14 @@
 # Handle Go vendor support for offline builds
 #
 # When importing Go modules, Go downloads the imported modules using
-# a network (proxy) connection ahead of the compile stage. This contradicts 
+# a network (proxy) connection ahead of the compile stage. This contradicts
 # the yocto build concept of fetching every source ahead of build-time
 # and supporting offline builds.
 #
-# To support offline builds, we use Go 'vendoring': module dependencies are 
+# To support offline builds, we use Go 'vendoring': module dependencies are
 # downloaded during the fetch-phase and unpacked into the modules 'vendor'
 # folder. Additionally a manifest file is generated for the 'vendor' folder
-# 
+#
 
 inherit go-mod
 
@@ -87,7 +87,7 @@ python do_go_vendor() {
 
         destsuffix = fetcher.ud[url].parm.get('destsuffix')
         # We derive the module repo / version in the following manner (exmaple):
-        # 
+        #
         # destsuffix = git/src/import/vendor.fetch/github.com/foo/bar@v1.2.3
         # p = github.com/foo/bar@v1.2.3
         # repo = github.com/foo/bar
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc
index be5761fb20b..918996bb094 100644
--- a/meta/conf/machine/include/arm/arch-armv4.inc
+++ b/meta/conf/machine/include/arm/arch-armv4.inc
@@ -4,7 +4,7 @@ TUNEVALID[arm] = "Enable ARM instruction set"
 TUNEVALID[armv4] = "Enable instructions for ARMv4"
 TUNE_CCARGS_MARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', ' -march=armv4${ARMPKGSFX_THUMB}', '', d)}"
 # enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it when we have also armv5 or thumb
-# maybe we should extend bb.utils.contains to support check for any checkvalues in value, now it does 
+# maybe we should extend bb.utils.contains to support check for any checkvalues in value, now it does
 # checkvalues.issubset(val) which cannot be used for negative test of foo neither bar in value
 FIX_V4BX_ARMV4 = "${@bb.utils.contains('TUNE_FEATURES', 'armv4', '--fix-v4bx', '', d)}"
 FIX_V4BX_ARMV5 = "${@bb.utils.contains('TUNE_FEATURES', 'armv5', '', '${FIX_V4BX_ARMV4}', d)}"