Merge branch 'upstreamMaster'

2 files changed, 39 insertions, 0 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 55d4e08..9c16e18 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,23 @@ Changed
 Removed
 -------
 
+[61] - 2022-01-31
+=================
+
+Added
+-----
+
+- Add further contributing guidelines around the use of the changelog and how maintainers deal with merge requests
+
+Changed
+-------
+
+- Mount cowspace readonly and read-write afterwards to prevent errors if multiple mounts are active
+- Extend default DHCP timeout to 60s to avoid issues with Spanning Tree Protocol (STP)
+
+Removed
+-------
+
 [60] - 2021-12-28
 =================
 
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 4dc8a77..7e097b1 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -18,3 +18,25 @@ All ash and bash scripts are linted using shellcheck:
   .. code:: bash
 
     make check
+
+Changelog
+=========
+
+When adding, changing or removing something in a merge request, add a sentence to the `CHANGELOG.rst <CHANGELOG.rst>`_
+explaining it.
+The changelog entry needs to be added to the unreleased section at the top, as that section is used for the next
+release.
+
+Merge requests and signed commits
+=================================
+
+Merge requests are not required to contain signed commits (using ``git commit -S`` - see `man 1 git-commit
+<https://man.archlinux.org/man/git-commit.1>`_).
+The project maintainers may rebase a given merge request branch at their discretion (if possible), which may remove
+signed commits.
+
+The tip of the project's default branch is required to be a signed commit by the project maintainers.
+For external contributors this means, that their merge request will be merged using ``--no-ff`` (see `man 1 git-merge
+<https://man.archlinux.org/man/git-merge.1>`_) in a signed merge commit, while contributions by the project maintainers
+may be merged using ``--ff`` when the top-most commit of the source branch is signed by a valid PGP key of the given
+maintainer.