Merge branch 'maint'
authorAndre Noll <maan@tuebingen.mpg.de>
Mon, 30 Aug 2021 18:33:40 +0000 (20:33 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Mon, 30 Aug 2021 18:33:40 +0000 (20:33 +0200)
Just one cherry-picked commit to make the maint branch compile with
newer glibc.

* maint:
  Avoid warning about sys/sysctl.h on glibc-2.30.


Trivial merge