diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c
index bc073683672..a57785f2801 100644
--- a/arch/arm/src/stm32/stm32_otgfsdev.c
+++ b/arch/arm/src/stm32/stm32_otgfsdev.c
@@ -153,48 +153,46 @@
 #endif
 
 #if defined(CONFIG_STM32_STM32F446) || defined(CONFIG_STM32_STM32F469)
-#  define OTGFS_GINT_RESETS (OTGFS_GINT_USBRST | OTGFS_GINT_RSTDET)
-#  define OTGFS_GINT_RESERVED (OTGFS_GINT_RES89 | \
-                              (OTGFS_GINT_RES16 | OTGFS_GINTMSK_EPMISM) \
-                              |OTGFS_GINT_RES22)
+#  define OTGFS_GINT_RESETS   (OTGFS_GINT_USBRST | OTGFS_GINT_RSTDET)
+#  define OTGFS_GINT_RESERVED (OTGFS_GINT_RES89 | OTGFS_GINT_RES16 | \
+                               OTGFS_GINTMSK_EPMISM | OTGFS_GINT_RES22)
 
-#  define OTGFS_GINT_RC_W1 (OTGFS_GINT_MMIS     | \
-                            OTGFS_GINT_SOF      | \
-                            OTGFS_GINT_ESUSP    | \
-                            OTGFS_GINT_USBSUSP  | \
-                            OTGFS_GINT_USBRST   | \
-                            OTGFS_GINT_ENUMDNE  | \
-                            OTGFS_GINT_ISOODRP  | \
-                            OTGFS_GINT_EOPF     | \
-                            OTGFS_GINT_IISOIXFR | \
-                            OTGFS_GINT_IISOOXFR | \
-                            OTGFS_GINT_RSTDET   | \
-                            OTGFS_GINT_LPMINT   | \
-                            OTGFS_GINT_CIDSCHG  | \
-                            OTGFS_GINT_DISC     | \
-                            OTGFS_GINT_SRQ      | \
-                            OTGFS_GINT_WKUP)
+#  define OTGFS_GINT_RC_W1    (OTGFS_GINT_MMIS     | \
+                               OTGFS_GINT_SOF      | \
+                               OTGFS_GINT_ESUSP    | \
+                               OTGFS_GINT_USBSUSP  | \
+                               OTGFS_GINT_USBRST   | \
+                               OTGFS_GINT_ENUMDNE  | \
+                               OTGFS_GINT_ISOODRP  | \
+                               OTGFS_GINT_EOPF     | \
+                               OTGFS_GINT_IISOIXFR | \
+                               OTGFS_GINT_IISOOXFR | \
+                               OTGFS_GINT_RSTDET   | \
+                               OTGFS_GINT_LPMINT   | \
+                               OTGFS_GINT_CIDSCHG  | \
+                               OTGFS_GINT_DISC     | \
+                               OTGFS_GINT_SRQ      | \
+                               OTGFS_GINT_WKUP)
 #else
-#  define OTGFS_GINT_RESETS OTGFS_GINT_USBRST
-#  define OTGFS_GINT_RESERVED (OTGFS_GINT_RES89 | \
-                              (OTGFS_GINT_RES16 | OTGFS_GINTMSK_EPMISM) \
-                              |OTGFS_GINT_RES2223 | \
+#  define OTGFS_GINT_RESETS   OTGFS_GINT_USBRST
+#  define OTGFS_GINT_RESERVED (OTGFS_GINT_RES89 | OTGFS_GINT_RES16 | \
+                               OTGFS_GINTMSK_EPMISM | OTGFS_GINT_RES2223 | \
                                OTGFS_GINT_RES27)
 
-#  define OTGFS_GINT_RC_W1 (OTGFS_GINT_MMIS     | \
-                            OTGFS_GINT_SOF      | \
-                            OTGFS_GINT_ESUSP    | \
-                            OTGFS_GINT_USBSUSP  | \
-                            OTGFS_GINT_USBRST   | \
-                            OTGFS_GINT_ENUMDNE  | \
-                            OTGFS_GINT_ISOODRP  | \
-                            OTGFS_GINT_EOPF     | \
-                            OTGFS_GINT_IISOIXFR | \
-                            OTGFS_GINT_IISOOXFR | \
-                            OTGFS_GINT_CIDSCHG  | \
-                            OTGFS_GINT_DISC     | \
-                            OTGFS_GINT_SRQ      | \
-                            OTGFS_GINT_WKUP)
+#  define OTGFS_GINT_RC_W1    (OTGFS_GINT_MMIS     | \
+                               OTGFS_GINT_SOF      | \
+                               OTGFS_GINT_ESUSP    | \
+                               OTGFS_GINT_USBSUSP  | \
+                               OTGFS_GINT_USBRST   | \
+                               OTGFS_GINT_ENUMDNE  | \
+                               OTGFS_GINT_ISOODRP  | \
+                               OTGFS_GINT_EOPF     | \
+                               OTGFS_GINT_IISOIXFR | \
+                               OTGFS_GINT_IISOOXFR | \
+                               OTGFS_GINT_CIDSCHG  | \
+                               OTGFS_GINT_DISC     | \
+                               OTGFS_GINT_SRQ      | \
+                               OTGFS_GINT_WKUP)
 #endif
 
 /* Debug ***********************************************************************/
diff --git a/arch/z80/src/z8/z8_schedulesigaction.c b/arch/z80/src/z8/z8_schedulesigaction.c
index 338bf3096a3..6c6b1a74b0c 100644
--- a/arch/z80/src/z8/z8_schedulesigaction.c
+++ b/arch/z80/src/z8/z8_schedulesigaction.c
@@ -52,14 +52,6 @@
 
 #ifndef CONFIG_DISABLE_SIGNALS
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -68,7 +60,8 @@
  * Name: z8_sigsetup
  ****************************************************************************/
 
-static void z8_sigsetup(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver, FAR chipreg_t *regs)
+static void z8_sigsetup(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver,
+                        FAR chipreg_t *regs)
 {
   /* Save the return address and interrupt state. These will be restored by
    * the signal trampoline after the signals have been delivered.
@@ -125,7 +118,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  _info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
+  sinfo("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
diff --git a/net/arp/Kconfig b/net/arp/Kconfig
index b4935e4c55c..540e4b0c873 100644
--- a/net/arp/Kconfig
+++ b/net/arp/Kconfig
@@ -31,8 +31,14 @@ config NET_ARP_IPIN
 	bool "ARP address harvesting"
 	default n
 	---help---
-		Harvest IP/MAC address mappings from the ARP table
-		from incoming IP packets.
+		Harvest IP/MAC address mappings from the ARP table from incoming
+		IP packets.  If this option is selected, CONFIG_NET_ARTAB_SIZE
+		should be large enough to hold the hosts on the network.
+
+		This option is NOT recommended on busy networks with many remote
+		hosts.  On such networks the ARP table will be full most of the
+		time and the MAC addresses that you want will get flushed from
+		the table often.
 
 config NET_ARP_SEND
 	bool "ARP send"