Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --cc .gitlab-ci.yml
index f76e53b56562e2e2955f600980a5c0aa6e493eda,b4be44843c51e052b9aa63da264a627ed5d0373b..30c8ff920b2f0f86652d252b33d99d998552656b
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -282,8 -284,8 +284,10 @@@ tests.package.test_ipython.TestIPythonP
  tests.package.test_ipython.TestIPythonPy3: *runtime_test
  tests.package.test_python.TestPython2: *runtime_test
  tests.package.test_python.TestPython3: *runtime_test
+ tests.package.test_python_cryptography.TestPythonPy2Cryptography: *runtime_test
+ tests.package.test_python_cryptography.TestPythonPy3Cryptography: *runtime_test
 +tests.package.test_rust.TestRust: *runtime_test
 +tests.package.test_rust.TestRustBin: *runtime_test
  tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: *runtime_test
  tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: *runtime_test
  tests.toolchain.test_external.TestExternalToolchainCCache: *runtime_test

diff --cc DEVELOPERS
Simple merge

diff --cc linux/Config.in
Simple merge

diff --cc package/libgpiod/libgpiod.hash
index 6baeee23586734f51c93749f0a9788bfa32db259,a98e138fa4d6dcf54900d0b89c0e1254de51b390..b29e12ebd29e9dddf38ce8a98129a208a4ce2131
--- 1/package/libgpiod/libgpiod.hash
--- 2/package/libgpiod/libgpiod.hash
+++ b/package/libgpiod/libgpiod.hash
@@@ -1,4 -1,2 +1,4 @@@
  # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc
- sha256 50c7862428ca90b58672e2475aea66d33a6fc86c6bab1928c0660f3aedf44a37  libgpiod-0.3.2.tar.xz
+ sha256 34c76b3730b9d4a1159bcb14000f78b1e890251b8a3823b794fa930654eabdd0  libgpiod-1.0.tar.xz
 +# Hash for license file
 +sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed  COPYING

diff --cc package/mesa3d-demos/mesa3d-demos.mk
Simple merge

diff --cc package/qemu/Config.in.host
Simple merge

diff --cc package/systemd/Config.in
Simple merge

diff --cc package/systemd/systemd.mk
Simple merge

diff --cc utils/scanpypi
index c96f1bc892c13f1f1717e62f9a470133dd809da8,14ee87784af57510649fecc0336ebd4aae5120cf..2b3188dbf6ddf2423b6c6d065bdf116f5f745ee0
--- 1/utils/scanpypi
--- 2/utils/scanpypi
+++ b/utils/scanpypi
@@@ -205,9 -212,9 +212,9 @@@ class BuildrootPackage()
                  if self.md5_sum == download_url['md5_digest']:
                      break
          else:
-             if download.__class__ == urllib2.HTTPError:
+             if download.__class__ == six.moves.urllib.error.HTTPError:
                  raise download
 -            raise DownloadFailed('Failed to downloas package {pkg}'
 +            raise DownloadFailed('Failed to download package {pkg}'
                                   .format(pkg=self.real_name))
          self.filename = self.used_url['filename']
          self.url = self.used_url['url']