diff --git a/.travis.yml b/.travis.yml
index 719144508..78bdc8b75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,8 @@ matrix:
                       - binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 patchutils
 
 script:
+    # This is here for the signoff check.
+    - ./tools/checkpatch.sh
     # Ideally we'd diff back to where we either branched off OpenOCD or master,
     # or riscv. But that's tricky, and the default git clone only gets the last
     # 50 changes any case. Most merges won't consist of more than 40 changes,
diff --git a/src/target/riscv/batch.c b/src/target/riscv/batch.c
index 81d0358ec..b2c7e834d 100644
--- a/src/target/riscv/batch.c
+++ b/src/target/riscv/batch.c
@@ -11,7 +11,7 @@
 #define get_field(reg, mask) (((reg) & (mask)) / ((mask) & ~((mask) << 1)))
 #define set_field(reg, mask, val) (((reg) & ~(mask)) | (((val) * ((mask) & ~((mask) << 1))) & (mask)))
 
-#define DTM_DMI_MAX_ADDRESS_LENGTH	((1<<DTM_DTMCS_ABITS_LENGTH)-1)
+#define DTM_DMI_MAX_ADDRESS_LENGTH	((1 << DTM_DTMCS_ABITS_LENGTH) - 1)
 #define DMI_SCAN_MAX_BIT_LENGTH (DTM_DMI_MAX_ADDRESS_LENGTH + DTM_DMI_DATA_LENGTH + DTM_DMI_OP_LENGTH)
 #define DMI_SCAN_BUF_SIZE (DIV_ROUND_UP(DMI_SCAN_MAX_BIT_LENGTH, 8))
 
diff --git a/src/target/riscv/encoding.h b/src/target/riscv/encoding.h
index 36bea2990..90f65def1 100644
--- a/src/target/riscv/encoding.h
+++ b/src/target/riscv/encoding.h
@@ -49,8 +49,8 @@
 #define SSTATUS64_SD        0x8000000000000000
 
 #define SSTATUS_VS_MASK     (SSTATUS_SIE | SSTATUS_SPIE | \
-                             SSTATUS_SPP | SSTATUS_SUM | \
-                             SSTATUS_MXR | SSTATUS_UXL)
+							SSTATUS_SPP | SSTATUS_SUM | \
+							SSTATUS_MXR | SSTATUS_UXL)
 
 #define HSTATUS_VSXL        0x300000000
 #define HSTATUS_VTSR        0x00400000