diff --git a/arch b/arch
index f228b56a83..5ab894e788 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit f228b56a8311067a4ca6e8cd7ca456686f3fdb56
+Subproject commit 5ab894e788050d6cbbf87178dc80cdbfcc04bc74
diff --git a/configs b/configs
index 83173e5f40..5f86fa27a3 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 83173e5f4078d563f2b9eee6a730f6720a4a00f5
+Subproject commit 5f86fa27a334d105764398a58344ad9c0c6c4462
diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c
index 2154ed5aea..1c02c40b24 100644
--- a/drivers/lcd/skeleton.c
+++ b/drivers/lcd/skeleton.c
@@ -395,7 +395,7 @@ FAR struct lcd_dev_s *up_oledinitialize(FAR struct spi_dev_s *spi)
 #warning "Missing logic"
 
   /* Configure and enable LCD */
- #warning "Missing logic"
+#warning "Missing logic"
 
   return &g_lcddev.dev;
 }
diff --git a/drivers/lcd/ug-2864ambag01.c b/drivers/lcd/ug-2864ambag01.c
index 51706026a9..6b8e081b24 100644
--- a/drivers/lcd/ug-2864ambag01.c
+++ b/drivers/lcd/ug-2864ambag01.c
@@ -175,7 +175,7 @@
 #  define SH1101A_MRATIO(d)      ((d) & 0x3f)
 #define SH1101A_DCDC_MODE        (0xad)                 /* Set DC-DC OFF/ON: (Double Bytes Command) */
 #  define SH1101A_DCDC_OFF       (0x8a)
- # define SH1101A_DCDC_ON        (0x8b)
+#  define SH1101A_DCDC_ON        (0x8b)
 #define SH1101A_DISPOFFON(s)     (0xae | ((s) & 0x01))  /* Display OFF/ON: (aeh - afh) */
 #  define SH1101A_DISPOFF        SH1101A_DISPOFFON(0)   /*   Display off */
 #  define SH1101A_DISPON         SH1101A_DISPOFFON(1)   /*   Display on */
diff --git a/include/nuttx/mm/mm.h b/include/nuttx/mm/mm.h
index 6a8c27ba46..3d2523eeac 100644
--- a/include/nuttx/mm/mm.h
+++ b/include/nuttx/mm/mm.h
@@ -287,7 +287,7 @@ extern "C"
  *   no global user heap structure.
  */
 
- #if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL)
+#if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL)
 /* In the kernel build, there a multiple user heaps; one for each task
  * group.  In this build configuration, the user heap structure lies
  * in a reserved region at the beginning of the .bss/.data address
diff --git a/libc/stdio/lib_fseek.c b/libc/stdio/lib_fseek.c
index c73d5154a1..f11efa1d09 100644
--- a/libc/stdio/lib_fseek.c
+++ b/libc/stdio/lib_fseek.c
@@ -107,7 +107,7 @@
 
 int fseek(FAR FILE *stream, long int offset, int whence)
 {
- #if CONFIG_STDIO_BUFFER_SIZE > 0
+#if CONFIG_STDIO_BUFFER_SIZE > 0
   /* Flush any valid read/write data in the buffer (also verifies stream) */
 
   if (lib_rdflush(stream) < 0 || lib_wrflush(stream) < 0)
diff --git a/libc/stdlib/lib_mkstemp.c b/libc/stdlib/lib_mkstemp.c
index 94b6dcc0af..6b92d0093d 100644
--- a/libc/stdlib/lib_mkstemp.c
+++ b/libc/stdlib/lib_mkstemp.c
@@ -54,7 +54,7 @@
  * Pre-processor definitions
  ****************************************************************************/
 
- #ifndef CONFIG_LIBC_TMPDIR
+#ifndef CONFIG_LIBC_TMPDIR
 #  define CONFIG_LIBC_TMPDIR "/tmp"
 #endif
 
diff --git a/libc/wqueue/work_usrthread.c b/libc/wqueue/work_usrthread.c
index 0179ed3c51..d359712d83 100644
--- a/libc/wqueue/work_usrthread.c
+++ b/libc/wqueue/work_usrthread.c
@@ -386,7 +386,7 @@ int work_usrstart(void)
     (void)pthread_attr_init(&attr);
     (void)pthread_attr_setstacksize(&attr, CONFIG_LIB_USRWORKSTACKSIZE);
 
-+#ifdef CONFIG_SCHED_SPORADIC
+#ifdef CONFIG_SCHED_SPORADIC
     /* Get the current sporadic scheduling parameters.  Those will not be
      * modified.
      */
diff --git a/net/arp/arp.h b/net/arp/arp.h
index c4526a65f4..65846b0015 100644
--- a/net/arp/arp.h
+++ b/net/arp/arp.h
@@ -176,7 +176,7 @@ struct arp_notify_s
  * Public Function Prototypes
  ****************************************************************************/
 
- #ifdef CONFIG_NET_ARP
+#ifdef CONFIG_NET_ARP
 /****************************************************************************
  * Name: arp_reset
  *
diff --git a/net/iob/iob_dump.c b/net/iob/iob_dump.c
index c9ffc7f4ab..a34dc1ca2a 100644
--- a/net/iob/iob_dump.c
+++ b/net/iob/iob_dump.c
@@ -50,7 +50,7 @@
  * Pre-processor definitions
  ****************************************************************************/
 
- #ifndef MIN
+#ifndef MIN
 #  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c
index 68f4277232..d8bcd9dd22 100644
--- a/net/tcp/tcp_callback.c
+++ b/net/tcp/tcp_callback.c
@@ -116,7 +116,7 @@ tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
 
          nllvdbg("Dropped %d bytes\n", dev->d_len);
 
- #ifdef CONFIG_NET_STATISTICS
+#ifdef CONFIG_NET_STATISTICS
           g_netstats.tcp.syndrop++;
           g_netstats.tcp.drop++;
 #endif
diff --git a/syscall/syscall_nparms.c b/syscall/syscall_nparms.c
index 292421643b..164ab3e3fd 100644
--- a/syscall/syscall_nparms.c
+++ b/syscall/syscall_nparms.c
@@ -72,4 +72,4 @@ const uint8_t g_funcnparms[SYS_nsyscalls] =
  * Public Functions
  ****************************************************************************/
 
- #endif /* CONFIG_LIB_SYSCALL */
+#endif /* CONFIG_LIB_SYSCALL */