Draft: Align with mainline at fc566d74005a4aefbe125b9b2f777d9514c60c87

.checkpatch.conf

@@ -14,7 +14,6 @@
 --ignore ENOSYS
 --ignore FILE_PATH_CHANGES
 --ignore GERRIT_CHANGE_ID
---ignore LINE_SPACING
 --ignore LOGICAL_CONTINUATIONS
 --ignore MACRO_WITH_FLOW_CONTROL
 --ignore PARENTHESIS_ALIGNMENT
@@ -23,6 +22,5 @@
 --ignore PREFER_KERNEL_TYPES
 --ignore SPLIT_STRING
 --ignore SSCANF_TO_KSTRTO
---ignore SWITCH_CASE_INDENT_LEVEL
 --ignore TRACING_LOGGING
 --ignore VOLATILE

.editorconfig

@@ -0,0 +1,17 @@
+# EditorConfig: https://editorconfig.org/
+
+# top-most EditorConfig file
+root = true
+
+# All (Defaults)
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 4
+tab_width = 4
+
+[*.patch,*.diff]
+trim_trailing_whitespace = false

HACKING

@@ -77,32 +77,6 @@ patch:
   src/openocd -s ../tcl -f /path/to/openocd.cfg
   @endcode
 
-- Runtime coverage testing
-
-  Apply the following patch to prevent OpenOCD from killing itself:
-  @code
---- a/src/openocd.c
-+++ b/src/openocd.c
-@@ -372,8 +372,6 @@ int openocd_main(int argc, char *argv[])
-
-        if (ERROR_FAIL == ret)
-                return EXIT_FAILURE;
--       else if (ERROR_OK != ret)
--               exit_on_signal(ret);
-
-        return ret;
- }
-  @endcode
-
-  Configure your OpenOCD binary with coverage support as follows:
-  @code
-  LDFLAGS="-fprofile-arcs -ftest-coverage"
-		   CFLAGS="-fprofile-arcs -ftest-coverage" ./configure
-  @endcode
-
-  Now every time OpenOCD is run, coverage info in your build directory is
-  updated. Running `gcov src/path/file.c` will generate a report.
-
 - Sparse Static Analyzer
 
   Using this tool allows identifying some bug in C code.
@@ -195,7 +169,9 @@ git remote add review https://USERNAME:PASSWORD@review.openocd.org/p/openocd.git
 Gerrit server, even if you plan to use several local branches for different
 topics. It is possible because @c for/master is not a traditional Git
 branch.
-  -# You will need to install this hook, we will look into a better solution:
+  -# You will need to install this hook to automatically add the
+     field "Change-Id:" in the commit message, as required by Gerrit.
+     We will look into a better solution:
 @code
 wget https://review.openocd.org/tools/hooks/commit-msg
 mv commit-msg .git/hooks
@@ -272,6 +248,12 @@ doc: fix typos
 @code
 git pull --rebase origin master
 @endcode
+
+-# When you create a new version of an old patch, check that the new patch
+   keeps the same 'Change-Id:' field of the old patch.
+   This allows the Gerrit server to recognize the patch as a new version of
+   the older one and keeps track of the history and the review process.
+
 -# Send the patches to the Gerrit server for review:
 @code
 git push review