Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] wayvnc and supporting libraries
@ 2020-07-28  2:27 zdykstra
  2020-07-28  2:36 ` [PR PATCH] [Updated] " zdykstra
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: zdykstra @ 2020-07-28  2:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

There is a new pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages wayvnc
https://github.com/void-linux/void-packages/pull/23884

wayvnc and supporting libraries
Tested locally on ppc64le and Remmina - works like a charm.

A patch file from https://github.com/void-linux/void-packages/pull/23884.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wayvnc-23884.patch --]
[-- Type: text/x-diff, Size: 3813 bytes --]

From df9c2af1acb1508076b1fb4ca1fb167a13390427 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:21:11 -0500
Subject: [PATCH 1/3] New package: aml-0.1.0

---
 common/shlibs        |  1 +
 srcpkgs/aml/template | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/aml/template

diff --git a/common/shlibs b/common/shlibs
index b81b17ce2e4..b474efb08c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libaml.so.0 aml-0.1.0_1
diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
new file mode 100644
index 00000000000..4c437658881
--- /dev/null
+++ b/srcpkgs/aml/template
@@ -0,0 +1,16 @@
+# Template file for 'aml'
+pkgname=aml
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+short_desc="Another Main Loop"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/aml"
+distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
+checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+
+post_install() {
+	vlicense COPYING
+}

From 0a365db396e3ff089ee1b0162dfa53004dec6dc6 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:22:26 -0500
Subject: [PATCH 2/3] New package: neatvnc-0.2.0

---
 common/shlibs            |  1 +
 srcpkgs/neatvnc/template | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/neatvnc/template

diff --git a/common/shlibs b/common/shlibs
index b474efb08c0..3f25e4a2861 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
+libneatvnc.so.0 neatvnc-0.2.0_1
diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
new file mode 100644
index 00000000000..4fe37648db3
--- /dev/null
+++ b/srcpkgs/neatvnc/template
@@ -0,0 +1,17 @@
+# Template file for 'neatvnc'
+pkgname=neatvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="aml libdrm-devel pixman-devel zlib-devel gnutls-devel libjpeg-turbo-devel"
+short_desc="Liberally licensed VNC server library"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/neatvnc"
+distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
+checksum=b8ab73f6137b9d8407639016de3ad98398f8e002c0eeef30b9fd034f82f9c799
+
+post_install() {
+	vlicense COPYING
+}

From 70a6a0dd4b93fcf9907bb344d2ff1d06ce67b945 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:23:25 -0500
Subject: [PATCH 3/3] New package: wayvnc-0.2.0

---
 srcpkgs/wayvnc/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/wayvnc/template

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
new file mode 100644
index 00000000000..0963240075a
--- /dev/null
+++ b/srcpkgs/wayvnc/template
@@ -0,0 +1,17 @@
+# Template file for 'wayvnc'
+pkgname=wayvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config ninja"
+makedepends="aml neatvnc libgbm gnutls-devel zlib-devel wayland-devel libjpeg-turbo-devel libdrm-devel pixman-devel libxkbcommon-devel"
+short_desc="VNC server for wlroots based Wayland compositors"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/wayvnc"
+distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
+checksum=a4ee6f49a821b326e89b2534048687330bc84ed3984499ab2cf39422517fb731
+
+post_install() {
+	vlicense COPYING
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] wayvnc and supporting libraries
  2020-07-28  2:27 [PR PATCH] wayvnc and supporting libraries zdykstra
@ 2020-07-28  2:36 ` zdykstra
  2020-07-28  2:56 ` zdykstra
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: zdykstra @ 2020-07-28  2:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages wayvnc
https://github.com/void-linux/void-packages/pull/23884

wayvnc and supporting libraries
Tested locally on ppc64le and Remmina - works like a charm.

A patch file from https://github.com/void-linux/void-packages/pull/23884.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wayvnc-23884.patch --]
[-- Type: text/x-diff, Size: 3827 bytes --]

From df9c2af1acb1508076b1fb4ca1fb167a13390427 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:21:11 -0500
Subject: [PATCH 1/3] New package: aml-0.1.0

---
 common/shlibs        |  1 +
 srcpkgs/aml/template | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/aml/template

diff --git a/common/shlibs b/common/shlibs
index b81b17ce2e4..b474efb08c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libaml.so.0 aml-0.1.0_1
diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
new file mode 100644
index 00000000000..4c437658881
--- /dev/null
+++ b/srcpkgs/aml/template
@@ -0,0 +1,16 @@
+# Template file for 'aml'
+pkgname=aml
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+short_desc="Another Main Loop"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/aml"
+distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
+checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+
+post_install() {
+	vlicense COPYING
+}

From 0a365db396e3ff089ee1b0162dfa53004dec6dc6 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:22:26 -0500
Subject: [PATCH 2/3] New package: neatvnc-0.2.0

---
 common/shlibs            |  1 +
 srcpkgs/neatvnc/template | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/neatvnc/template

diff --git a/common/shlibs b/common/shlibs
index b474efb08c0..3f25e4a2861 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
+libneatvnc.so.0 neatvnc-0.2.0_1
diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
new file mode 100644
index 00000000000..4fe37648db3
--- /dev/null
+++ b/srcpkgs/neatvnc/template
@@ -0,0 +1,17 @@
+# Template file for 'neatvnc'
+pkgname=neatvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="aml libdrm-devel pixman-devel zlib-devel gnutls-devel libjpeg-turbo-devel"
+short_desc="Liberally licensed VNC server library"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/neatvnc"
+distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
+checksum=b8ab73f6137b9d8407639016de3ad98398f8e002c0eeef30b9fd034f82f9c799
+
+post_install() {
+	vlicense COPYING
+}

From 0e11292934d12a257d3b58a1fb82b9f28bcd6e34 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:23:25 -0500
Subject: [PATCH 3/3] New package: wayvnc-0.2.0

---
 srcpkgs/wayvnc/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/wayvnc/template

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
new file mode 100644
index 00000000000..f062040ba6e
--- /dev/null
+++ b/srcpkgs/wayvnc/template
@@ -0,0 +1,17 @@
+# Template file for 'wayvnc'
+pkgname=wayvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config ninja wayland-devel"
+makedepends="aml neatvnc libgbm gnutls-devel zlib-devel wayland-devel libjpeg-turbo-devel libdrm-devel pixman-devel libxkbcommon-devel"
+short_desc="VNC server for wlroots based Wayland compositors"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/wayvnc"
+distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
+checksum=a4ee6f49a821b326e89b2534048687330bc84ed3984499ab2cf39422517fb731
+
+post_install() {
+	vlicense COPYING
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] wayvnc and supporting libraries
  2020-07-28  2:27 [PR PATCH] wayvnc and supporting libraries zdykstra
  2020-07-28  2:36 ` [PR PATCH] [Updated] " zdykstra
@ 2020-07-28  2:56 ` zdykstra
  2020-07-28  3:49 ` zdykstra
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: zdykstra @ 2020-07-28  2:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages wayvnc
https://github.com/void-linux/void-packages/pull/23884

wayvnc and supporting libraries
Tested locally on ppc64le and Remmina - works like a charm.

A patch file from https://github.com/void-linux/void-packages/pull/23884.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wayvnc-23884.patch --]
[-- Type: text/x-diff, Size: 3917 bytes --]

From af1c692cc8d188014032809e147a5749105e1e71 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:21:11 -0500
Subject: [PATCH 1/3] New package: aml-0.1.0

---
 common/shlibs        |  1 +
 srcpkgs/aml/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/aml/template

diff --git a/common/shlibs b/common/shlibs
index b81b17ce2e4..b474efb08c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libaml.so.0 aml-0.1.0_1
diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
new file mode 100644
index 00000000000..3f4e73d5413
--- /dev/null
+++ b/srcpkgs/aml/template
@@ -0,0 +1,20 @@
+# Template file for 'aml'
+pkgname=aml
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+short_desc="Another Main Loop"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/aml"
+distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
+checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_install() {
+	vlicense COPYING
+}

From c09a7d585438f9d828d9c4cb81aee10bc8845b25 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:22:26 -0500
Subject: [PATCH 2/3] New package: neatvnc-0.2.0

---
 common/shlibs            |  1 +
 srcpkgs/neatvnc/template | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/neatvnc/template

diff --git a/common/shlibs b/common/shlibs
index b474efb08c0..3f25e4a2861 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
+libneatvnc.so.0 neatvnc-0.2.0_1
diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
new file mode 100644
index 00000000000..4fe37648db3
--- /dev/null
+++ b/srcpkgs/neatvnc/template
@@ -0,0 +1,17 @@
+# Template file for 'neatvnc'
+pkgname=neatvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="aml libdrm-devel pixman-devel zlib-devel gnutls-devel libjpeg-turbo-devel"
+short_desc="Liberally licensed VNC server library"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/neatvnc"
+distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
+checksum=b8ab73f6137b9d8407639016de3ad98398f8e002c0eeef30b9fd034f82f9c799
+
+post_install() {
+	vlicense COPYING
+}

From a2463320a5716f4140899f4efd3e68d06ce2b211 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:23:25 -0500
Subject: [PATCH 3/3] New package: wayvnc-0.2.0

---
 srcpkgs/wayvnc/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/wayvnc/template

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
new file mode 100644
index 00000000000..f062040ba6e
--- /dev/null
+++ b/srcpkgs/wayvnc/template
@@ -0,0 +1,17 @@
+# Template file for 'wayvnc'
+pkgname=wayvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config ninja wayland-devel"
+makedepends="aml neatvnc libgbm gnutls-devel zlib-devel wayland-devel libjpeg-turbo-devel libdrm-devel pixman-devel libxkbcommon-devel"
+short_desc="VNC server for wlroots based Wayland compositors"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/wayvnc"
+distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
+checksum=a4ee6f49a821b326e89b2534048687330bc84ed3984499ab2cf39422517fb731
+
+post_install() {
+	vlicense COPYING
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] wayvnc and supporting libraries
  2020-07-28  2:27 [PR PATCH] wayvnc and supporting libraries zdykstra
  2020-07-28  2:36 ` [PR PATCH] [Updated] " zdykstra
  2020-07-28  2:56 ` zdykstra
@ 2020-07-28  3:49 ` zdykstra
  2020-07-28  4:33 ` zdykstra
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: zdykstra @ 2020-07-28  3:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages wayvnc
https://github.com/void-linux/void-packages/pull/23884

wayvnc and supporting libraries
Tested locally on ppc64le with Remmina - works like a charm.

A patch file from https://github.com/void-linux/void-packages/pull/23884.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wayvnc-23884.patch --]
[-- Type: text/x-diff, Size: 3917 bytes --]

From 7614a520c2948483794a04b6bf4c7c395648791f Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:21:11 -0500
Subject: [PATCH 1/3] New package: aml-0.1.0

---
 common/shlibs        |  1 +
 srcpkgs/aml/template | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/aml/template

diff --git a/common/shlibs b/common/shlibs
index b81b17ce2e4..b474efb08c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libaml.so.0 aml-0.1.0_1
diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
new file mode 100644
index 00000000000..4c437658881
--- /dev/null
+++ b/srcpkgs/aml/template
@@ -0,0 +1,16 @@
+# Template file for 'aml'
+pkgname=aml
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+short_desc="Another Main Loop"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/aml"
+distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
+checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+
+post_install() {
+	vlicense COPYING
+}

From b867bda973ae7b48d19a8fefb3f4968740d5c001 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:22:26 -0500
Subject: [PATCH 2/3] New package: neatvnc-0.2.0

---
 common/shlibs            |  1 +
 srcpkgs/neatvnc/template | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/neatvnc/template

diff --git a/common/shlibs b/common/shlibs
index b474efb08c0..3f25e4a2861 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
+libneatvnc.so.0 neatvnc-0.2.0_1
diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
new file mode 100644
index 00000000000..4fe37648db3
--- /dev/null
+++ b/srcpkgs/neatvnc/template
@@ -0,0 +1,17 @@
+# Template file for 'neatvnc'
+pkgname=neatvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="aml libdrm-devel pixman-devel zlib-devel gnutls-devel libjpeg-turbo-devel"
+short_desc="Liberally licensed VNC server library"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/neatvnc"
+distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
+checksum=b8ab73f6137b9d8407639016de3ad98398f8e002c0eeef30b9fd034f82f9c799
+
+post_install() {
+	vlicense COPYING
+}

From b22d7782497e0c208576779466eb6c94915da2cd Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:23:25 -0500
Subject: [PATCH 3/3] New package: wayvnc-0.2.0

---
 srcpkgs/wayvnc/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/wayvnc/template

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
new file mode 100644
index 00000000000..ff9f37f6c95
--- /dev/null
+++ b/srcpkgs/wayvnc/template
@@ -0,0 +1,21 @@
+# Template file for 'wayvnc'
+pkgname=wayvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config ninja wayland-devel"
+makedepends="aml neatvnc libgbm gnutls-devel zlib-devel wayland-devel libjpeg-turbo-devel libdrm-devel pixman-devel libxkbcommon-devel"
+short_desc="VNC server for wlroots based Wayland compositors"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/wayvnc"
+distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
+checksum=a4ee6f49a821b326e89b2534048687330bc84ed3984499ab2cf39422517fb731
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_install() {
+	vlicense COPYING
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] wayvnc and supporting libraries
  2020-07-28  2:27 [PR PATCH] wayvnc and supporting libraries zdykstra
                   ` (2 preceding siblings ...)
  2020-07-28  3:49 ` zdykstra
@ 2020-07-28  4:33 ` zdykstra
  2020-07-28 18:40 ` zdykstra
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: zdykstra @ 2020-07-28  4:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages wayvnc
https://github.com/void-linux/void-packages/pull/23884

wayvnc and supporting libraries
Tested locally on ppc64le with Remmina - works like a charm.

A patch file from https://github.com/void-linux/void-packages/pull/23884.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wayvnc-23884.patch --]
[-- Type: text/x-diff, Size: 4007 bytes --]

From d9c27f2e49852222e272ee62094ebb4c62608f5c Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:21:11 -0500
Subject: [PATCH 1/3] New package: aml-0.1.0

---
 common/shlibs        |  1 +
 srcpkgs/aml/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/aml/template

diff --git a/common/shlibs b/common/shlibs
index b81b17ce2e4..b474efb08c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libaml.so.0 aml-0.1.0_1
diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
new file mode 100644
index 00000000000..3f4e73d5413
--- /dev/null
+++ b/srcpkgs/aml/template
@@ -0,0 +1,20 @@
+# Template file for 'aml'
+pkgname=aml
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+short_desc="Another Main Loop"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/aml"
+distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
+checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_install() {
+	vlicense COPYING
+}

From ed881443cca80a96ff0b6f65a6fe8fc7bf51cdbd Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:22:26 -0500
Subject: [PATCH 2/3] New package: neatvnc-0.2.0

---
 common/shlibs            |  1 +
 srcpkgs/neatvnc/template | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/neatvnc/template

diff --git a/common/shlibs b/common/shlibs
index b474efb08c0..3f25e4a2861 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
+libneatvnc.so.0 neatvnc-0.2.0_1
diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
new file mode 100644
index 00000000000..4fe37648db3
--- /dev/null
+++ b/srcpkgs/neatvnc/template
@@ -0,0 +1,17 @@
+# Template file for 'neatvnc'
+pkgname=neatvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="aml libdrm-devel pixman-devel zlib-devel gnutls-devel libjpeg-turbo-devel"
+short_desc="Liberally licensed VNC server library"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/neatvnc"
+distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
+checksum=b8ab73f6137b9d8407639016de3ad98398f8e002c0eeef30b9fd034f82f9c799
+
+post_install() {
+	vlicense COPYING
+}

From 0cd109584a519d9fcb5127f8d213c7e2760f1c61 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:23:25 -0500
Subject: [PATCH 3/3] New package: wayvnc-0.2.0

---
 srcpkgs/wayvnc/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/wayvnc/template

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
new file mode 100644
index 00000000000..ff9f37f6c95
--- /dev/null
+++ b/srcpkgs/wayvnc/template
@@ -0,0 +1,21 @@
+# Template file for 'wayvnc'
+pkgname=wayvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config ninja wayland-devel"
+makedepends="aml neatvnc libgbm gnutls-devel zlib-devel wayland-devel libjpeg-turbo-devel libdrm-devel pixman-devel libxkbcommon-devel"
+short_desc="VNC server for wlroots based Wayland compositors"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/wayvnc"
+distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
+checksum=a4ee6f49a821b326e89b2534048687330bc84ed3984499ab2cf39422517fb731
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_install() {
+	vlicense COPYING
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: wayvnc and supporting libraries
  2020-07-28  2:27 [PR PATCH] wayvnc and supporting libraries zdykstra
                   ` (3 preceding siblings ...)
  2020-07-28  4:33 ` zdykstra
@ 2020-07-28 18:40 ` zdykstra
  2020-08-04 15:40 ` [PR PATCH] [Updated] " zdykstra
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: zdykstra @ 2020-07-28 18:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/23884#issuecomment-665209870

Comment:
Should aml and neatvnc have -devel sub-packages?

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] wayvnc and supporting libraries
  2020-07-28  2:27 [PR PATCH] wayvnc and supporting libraries zdykstra
                   ` (4 preceding siblings ...)
  2020-07-28 18:40 ` zdykstra
@ 2020-08-04 15:40 ` zdykstra
  2020-08-04 15:48 ` zdykstra
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: zdykstra @ 2020-08-04 15:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages wayvnc
https://github.com/void-linux/void-packages/pull/23884

wayvnc and supporting libraries
Tested locally on ppc64le with Remmina - works like a charm.

A patch file from https://github.com/void-linux/void-packages/pull/23884.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wayvnc-23884.patch --]
[-- Type: text/x-diff, Size: 5005 bytes --]

From ca49ce5c40e0b0220712cddab778ed9dfb234408 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:21:11 -0500
Subject: [PATCH 1/3] New package: aml-0.1.0

---
 common/shlibs        |  1 +
 srcpkgs/aml-devel    |  1 +
 srcpkgs/aml/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/aml-devel
 create mode 100644 srcpkgs/aml/template

diff --git a/common/shlibs b/common/shlibs
index b81b17ce2e4..b474efb08c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libaml.so.0 aml-0.1.0_1
diff --git a/srcpkgs/aml-devel b/srcpkgs/aml-devel
new file mode 120000
index 00000000000..511960e2367
--- /dev/null
+++ b/srcpkgs/aml-devel
@@ -0,0 +1 @@
+aml
\ No newline at end of file
diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
new file mode 100644
index 00000000000..4fde3315b80
--- /dev/null
+++ b/srcpkgs/aml/template
@@ -0,0 +1,30 @@
+# Template file for 'aml'
+pkgname=aml
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+short_desc="Another Main Loop"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/aml"
+distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
+checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_install() {
+	vlicense COPYING
+}
+
+aml-devel_package() {
+	depends="aml>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From f170b437108bbac38f827c8ec7b78036966a1ef6 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:22:26 -0500
Subject: [PATCH 2/3] New package: neatvnc-0.2.0

---
 common/shlibs            |  1 +
 srcpkgs/neatvnc-devel    |  1 +
 srcpkgs/neatvnc/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/neatvnc-devel
 create mode 100644 srcpkgs/neatvnc/template

diff --git a/common/shlibs b/common/shlibs
index b474efb08c0..3f25e4a2861 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
+libneatvnc.so.0 neatvnc-0.2.0_1
diff --git a/srcpkgs/neatvnc-devel b/srcpkgs/neatvnc-devel
new file mode 120000
index 00000000000..a0ee2e2a7e9
--- /dev/null
+++ b/srcpkgs/neatvnc-devel
@@ -0,0 +1 @@
+neatvnc
\ No newline at end of file
diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
new file mode 100644
index 00000000000..ac679e14a12
--- /dev/null
+++ b/srcpkgs/neatvnc/template
@@ -0,0 +1,27 @@
+# Template file for 'neatvnc'
+pkgname=neatvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="aml-devel libdrm-devel pixman-devel zlib-devel gnutls-devel libjpeg-turbo-devel"
+short_desc="Liberally licensed VNC server library"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/neatvnc"
+distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
+checksum=b8ab73f6137b9d8407639016de3ad98398f8e002c0eeef30b9fd034f82f9c799
+
+post_install() {
+	vlicense COPYING
+}
+
+neatvnc-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From cff97f98ebe7090a5bd409a253dafd1a08d94faf Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:23:25 -0500
Subject: [PATCH 3/3] New package: wayvnc-0.2.0

---
 srcpkgs/wayvnc/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/wayvnc/template

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
new file mode 100644
index 00000000000..4ff4c5d3afb
--- /dev/null
+++ b/srcpkgs/wayvnc/template
@@ -0,0 +1,21 @@
+# Template file for 'wayvnc'
+pkgname=wayvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config ninja wayland-devel"
+makedepends="aml-devel neatvnc-devel libgbm gnutls-devel zlib-devel wayland-devel libjpeg-turbo-devel libdrm-devel pixman-devel libxkbcommon-devel"
+short_desc="VNC server for wlroots based Wayland compositors"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/wayvnc"
+distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
+checksum=a4ee6f49a821b326e89b2534048687330bc84ed3984499ab2cf39422517fb731
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_install() {
+	vlicense COPYING
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] wayvnc and supporting libraries
  2020-07-28  2:27 [PR PATCH] wayvnc and supporting libraries zdykstra
                   ` (5 preceding siblings ...)
  2020-08-04 15:40 ` [PR PATCH] [Updated] " zdykstra
@ 2020-08-04 15:48 ` zdykstra
  2020-08-04 15:51 ` zdykstra
  2020-08-04 15:52 ` [PR PATCH] [Closed]: " ahesford
  8 siblings, 0 replies; 10+ messages in thread
From: zdykstra @ 2020-08-04 15:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages wayvnc
https://github.com/void-linux/void-packages/pull/23884

wayvnc and supporting libraries
Tested locally on ppc64le with Remmina - works like a charm.

A patch file from https://github.com/void-linux/void-packages/pull/23884.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wayvnc-23884.patch --]
[-- Type: text/x-diff, Size: 1338945 bytes --]

From ca49ce5c40e0b0220712cddab778ed9dfb234408 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:21:11 -0500
Subject: [PATCH 001/298] New package: aml-0.1.0

---
 common/shlibs        |  1 +
 srcpkgs/aml-devel    |  1 +
 srcpkgs/aml/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/aml-devel
 create mode 100644 srcpkgs/aml/template

diff --git a/common/shlibs b/common/shlibs
index b81b17ce2e4..b474efb08c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libaml.so.0 aml-0.1.0_1
diff --git a/srcpkgs/aml-devel b/srcpkgs/aml-devel
new file mode 120000
index 00000000000..511960e2367
--- /dev/null
+++ b/srcpkgs/aml-devel
@@ -0,0 +1 @@
+aml
\ No newline at end of file
diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
new file mode 100644
index 00000000000..4fde3315b80
--- /dev/null
+++ b/srcpkgs/aml/template
@@ -0,0 +1,30 @@
+# Template file for 'aml'
+pkgname=aml
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+short_desc="Another Main Loop"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/aml"
+distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
+checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_install() {
+	vlicense COPYING
+}
+
+aml-devel_package() {
+	depends="aml>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From f170b437108bbac38f827c8ec7b78036966a1ef6 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:22:26 -0500
Subject: [PATCH 002/298] New package: neatvnc-0.2.0

---
 common/shlibs            |  1 +
 srcpkgs/neatvnc-devel    |  1 +
 srcpkgs/neatvnc/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/neatvnc-devel
 create mode 100644 srcpkgs/neatvnc/template

diff --git a/common/shlibs b/common/shlibs
index b474efb08c0..3f25e4a2861 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
+libneatvnc.so.0 neatvnc-0.2.0_1
diff --git a/srcpkgs/neatvnc-devel b/srcpkgs/neatvnc-devel
new file mode 120000
index 00000000000..a0ee2e2a7e9
--- /dev/null
+++ b/srcpkgs/neatvnc-devel
@@ -0,0 +1 @@
+neatvnc
\ No newline at end of file
diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
new file mode 100644
index 00000000000..ac679e14a12
--- /dev/null
+++ b/srcpkgs/neatvnc/template
@@ -0,0 +1,27 @@
+# Template file for 'neatvnc'
+pkgname=neatvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="aml-devel libdrm-devel pixman-devel zlib-devel gnutls-devel libjpeg-turbo-devel"
+short_desc="Liberally licensed VNC server library"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/neatvnc"
+distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
+checksum=b8ab73f6137b9d8407639016de3ad98398f8e002c0eeef30b9fd034f82f9c799
+
+post_install() {
+	vlicense COPYING
+}
+
+neatvnc-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From cff97f98ebe7090a5bd409a253dafd1a08d94faf Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:23:25 -0500
Subject: [PATCH 003/298] New package: wayvnc-0.2.0

---
 srcpkgs/wayvnc/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/wayvnc/template

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
new file mode 100644
index 00000000000..4ff4c5d3afb
--- /dev/null
+++ b/srcpkgs/wayvnc/template
@@ -0,0 +1,21 @@
+# Template file for 'wayvnc'
+pkgname=wayvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config ninja wayland-devel"
+makedepends="aml-devel neatvnc-devel libgbm gnutls-devel zlib-devel wayland-devel libjpeg-turbo-devel libdrm-devel pixman-devel libxkbcommon-devel"
+short_desc="VNC server for wlroots based Wayland compositors"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/wayvnc"
+distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
+checksum=a4ee6f49a821b326e89b2534048687330bc84ed3984499ab2cf39422517fb731
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_install() {
+	vlicense COPYING
+}

From 47ef533e7b6018b46d278ae586c576b2aa28cd3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 06:25:14 +0200
Subject: [PATCH 004/298] mlt: fix build w/ qt5-5.15.0 (QPainterPath)

---
 srcpkgs/mlt/patches/qt5-5.15.0.patch | 40 ++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/mlt/patches/qt5-5.15.0.patch

diff --git a/srcpkgs/mlt/patches/qt5-5.15.0.patch b/srcpkgs/mlt/patches/qt5-5.15.0.patch
new file mode 100644
index 00000000000..35151677b19
--- /dev/null
+++ b/srcpkgs/mlt/patches/qt5-5.15.0.patch
@@ -0,0 +1,40 @@
+--- src/modules/qt/producer_qtext.cpp	2020-02-16 23:31:58.000000000 +0100
++++ src/modules/qt/producer_qtext.cpp	2020-07-28 06:18:44.995745573 +0200
+@@ -26,6 +26,7 @@
+ #include <QImage>
+ #include <QColor>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QFont>
+ #include <QString>
+ #include <QTextCodec>
+--- src/modules/qt/kdenlivetitle_wrapper.cpp	2020-02-16 23:31:58.000000000 +0100
++++ src/modules/qt/kdenlivetitle_wrapper.cpp	2020-07-28 06:21:45.582754889 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDebug>
+ #include <QMutex>
+ #include <QGraphicsScene>
+--- src/modules/qt/graph.h	2020-02-16 23:31:58.000000000 +0100
++++ src/modules/qt/graph.h	2020-07-28 06:22:36.848757534 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include <framework/mlt.h>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRectF>
+ 
+ void setup_graph_painter( QPainter& p, QRectF& rect, mlt_properties filter_properties );
+--- src/modules/qt/filter_qtext.cpp	2020-02-16 23:31:58.000000000 +0100
++++ src/modules/qt/filter_qtext.cpp	2020-07-28 06:23:09.603759224 +0200
+@@ -21,6 +21,7 @@
+ #include <framework/mlt.h>
+ #include <framework/mlt_log.h>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QString>
+ 
+ static QRectF get_text_path( QPainterPath* qpath, mlt_properties filter_properties, const char* text, double scale )

From 12267eb278595ba40457510f352d01f6e74cee76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 13 Jun 2020 18:45:12 -0300
Subject: [PATCH 005/298] common/environment/setup/install.sh: add vcompletion.

Install function for installing shell completions in the appropriate
place according to the shell used.
---
 Manual.md                           |  7 +++++++
 common/environment/setup/install.sh | 30 ++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/Manual.md b/Manual.md
index 5b49dc5ddd4..a2e43334b9d 100644
--- a/Manual.md
+++ b/Manual.md
@@ -337,6 +337,13 @@ The following functions are defined by `xbps-src` and can be used on any templat
 	Note that vsed will call the sed command for every regex specified against
 	every file specified, in the order that they are given.
 
+- *vcompletion()* `<file> <shell> [<command>]`
+
+	Installs shell completion from `file` for `command`, in the correct location
+	and with the appropriate filename for `shell`. If `command` isn't specified,
+	it will default to `pkgname`. The `shell` argument can be one of `bash`,
+	`fish` or `zsh`.
+
 > Shell wildcards must be properly quoted, Example: `vmove "usr/lib/*.a"`.
 
 <a id="global_vars"></a>
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f9a1ace90e7..742f13075f8 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -13,7 +13,7 @@ _noglob_helper() {
 }
 
 # Apply _noglob to v* commands
-for cmd in vinstall vcopy vmove vmkdir vbin vman vdoc vconf vsconf vlicense vsv; do
+for cmd in vinstall vcopy vcompletion vmove vmkdir vbin vman vdoc vconf vsconf vlicense vsv; do
        alias ${cmd}="set -f; _noglob_helper _${cmd}"
 done
 
@@ -258,3 +258,31 @@ _vmkdir() {
 		install -dm${mode} ${_destdir}/${dir}
 	fi
 }
+
+_vcompletion() {
+	local file="$1" shell="$2" cmd="${3:-${pkgname}}"
+	local _bash_completion_dir=usr/share/bash-completion/completions/
+	local _fish_completion_dir=usr/share/fish/vendor_completions.d/
+	local _zsh_completion_dir=usr/share/zsh/site-functions/
+
+	if [ -z "$DESTDIR" ]; then
+		msg_red "$pkgver: vcompletion: DESTDIR unset, can't continue...\n"
+		return 1
+	fi
+
+	if [ $# -lt 2 ]; then
+		msg_red "$pkgver: vcompletion: 2 arguments expected: <file> <shell>\n"
+		return 1
+	fi
+
+	if ! [ -f "$file" ]; then
+		msg_red "$pkgver: vcompletion: file $file doesn't exist\n"
+	fi
+
+	case "$shell" in
+		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
+		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
+		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+	esac
+}

From 012a2b404766e2f8b777ba6ed29e5c4b5d4d5aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 13 Jun 2020 19:00:05 -0300
Subject: [PATCH 006/298] common/build-helper/qemu.sh: add vtargetrun function.

It's a function to call the qemu executable for the target arch, or a
noop if the build isn't a cross build.
---
 Manual.md                   | 4 +++-
 common/build-helper/qemu.sh | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Manual.md b/Manual.md
index a2e43334b9d..be28d89e566 100644
--- a/Manual.md
+++ b/Manual.md
@@ -970,7 +970,9 @@ additional paths to be searched when linking target binaries to be introspected.
 - `qemu` sets additional variables for the `cmake` and `meson` build styles to allow
 executing cross-compiled binaries inside qemu.
 It sets `CMAKE_CROSSCOMPILING_EMULATOR` for cmake and `exe_wrapper` for meson
-to `qemu-<target_arch>-static` and `QEMU_LD_PREFIX` to `XBPS_CROSS_BASE`
+to `qemu-<target_arch>-static` and `QEMU_LD_PREFIX` to `XBPS_CROSS_BASE`.
+It also creates the `vtargetrun` function to wrap commands in a call to
+`qemu-<target_arch>-static` for the target architecture.
 
 - `qmake` creates the `qt.conf` configuration file (cf. `qmake` `build_style`)
 needed for cross builds and a qmake-wrapper to make `qmake` use this configuration.
diff --git a/common/build-helper/qemu.sh b/common/build-helper/qemu.sh
index f7a1839cc3e..d6a4342f5e8 100644
--- a/common/build-helper/qemu.sh
+++ b/common/build-helper/qemu.sh
@@ -4,3 +4,11 @@ if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" qemu-user-static"
 	fi
 fi
+
+vtargetrun() {
+	if [ "$CROSS_BUILD" ]; then
+		"/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static" "$@"
+	else
+		"$@"
+	fi
+}

From 535fffaf6bf037f65193d475b88d014eca0db616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 11 Jun 2020 00:38:11 -0300
Subject: [PATCH 007/298] rustup: add completions for all archs.

Use qemu build_helper and vcompletion.

Completion generation is broken for armv6l-musl due to rustup not
knowing about the architecture.
---
 srcpkgs/rustup/template | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 3cf8ccf6b78..6472ae1f10c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,8 +1,9 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.22.1
-revision=1
+revision=2
 build_style=cargo
+build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
 makedepends="libressl-devel zlib-devel libcurl-devel"
@@ -13,19 +14,25 @@ homepage="https://www.rustup.rs"
 distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz"
 checksum=ad46cc624f318a9493aa62fc9612a450564fe20ba93c689e0ad856bff3c64c5b
 
+post_build() {
+	# rustup errors out because it doesn't know about armv6l-musl
+	if [ "$XBPS_TARGET_MACHINE" != armv6l-musl ]; then
+		RUSTUP="target/${RUST_TARGET}/release/rustup-init"
+		ln -sf "$RUSTUP" rustup
+		# generate shell completions
+		vtargetrun ./rustup completions zsh >rustup.zsh
+		vtargetrun ./rustup completions bash >rustup.bash
+		vtargetrun ./rustup completions fish >rustup.fish
+	fi
+}
+
 do_install() {
 	vbin target/${RUST_TARGET}/release/rustup-init
 
-	if ! [ "$CROSS_BUILD" ]; then
-		# generate shell completions
-		ln -s target/${RUST_TARGET}/release/rustup-init rustup
-		./rustup completions zsh > rustup.zsh
-		./rustup completions bash > rustup.bash
-		./rustup completions fish > rustup.fish
-
-		vinstall rustup.zsh 0644 usr/share/zsh/site-functions/ _rustup
-		vinstall rustup.bash 0644 usr/share/bash-completion/completions/ rustup
-		vinstall rustup.fish 0644 usr/share/fish/vendor_completions.d/
+	if [ "$XBPS_TARGET_MACHINE" != armv6l-musl ]; then
+		vcompletion rustup.bash bash
+		vcompletion rustup.fish fish
+		vcompletion rustup.zsh zsh
 	fi
 
 	vdoc README.md

From 3e31bb2e7ff2568008a4843efcc0e51f1087575f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 13 Jun 2020 18:58:48 -0300
Subject: [PATCH 008/298] starship: simplify completion generation.

Use qemu build_helper and vcompletion.
---
 srcpkgs/starship/template | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index b792560ff46..eb285022859 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -3,7 +3,7 @@ pkgname=starship
 version=0.44.0
 revision=1
 build_style=cargo
-build_helper="rust"
+build_helper=qemu
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
 checkdepends="git"
@@ -14,9 +14,12 @@ homepage="https://starship.rs"
 distfiles="https://github.com/starship/starship/archive/v${version}.tar.gz"
 checksum=b002fa0e2b34ad59330a543461a51648751db4ae8d439d58065a3b9656772fe3
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qemu-user-static"
-fi
+post_build() {
+	STARSHIP="target/${RUST_TARGET}/release/starship"
+	vtargetrun ${STARSHIP} completions zsh  >starship.zsh
+	vtargetrun ${STARSHIP} completions bash >starship.bash
+	vtargetrun ${STARSHIP} completions fish >starship.fish
+}
 
 pre_check() {
 	[ -L target/debug ] && unlink target/debug
@@ -24,19 +27,9 @@ pre_check() {
 }
 
 post_install() {
-	STARSHIP="target/${RUST_TARGET}/release/starship"
-	if [ "$CROSS_BUILD" ]; then
-		export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
-		STARSHIP="/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static ${STARSHIP}"
-	fi
-
-	${STARSHIP} completions zsh  >starship.zsh
-	${STARSHIP} completions bash >starship.bash
-	${STARSHIP} completions fish >starship.fish
-
-	vinstall starship.zsh 0644 usr/share/zsh/site-functions/ _starship
-	vinstall starship.bash 0644 usr/share/bash-completion/completions/ starship
-	vinstall starship.fish 0644 usr/share/fish/vendor_completions.d/
+	vcompletion starship.bash bash
+	vcompletion starship.fish fish
+	vcompletion starship.zsh zsh
 
 	vlicense LICENSE
 }

From 89f6d6d8b0af75e10789f7a2fcdff13477e715f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 06:46:13 +0200
Subject: [PATCH 009/298] obconf: needs tar in hostmakedepends

---
 srcpkgs/obconf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/obconf/template b/srcpkgs/obconf/template
index 2a4b0fe3dae..e93d63381b8 100644
--- a/srcpkgs/obconf/template
+++ b/srcpkgs/obconf/template
@@ -3,7 +3,7 @@ pkgname=obconf
 version=2.0.4
 revision=6
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config tar"
 makedepends="gtk+-devel libglade-devel libSM-devel imlib2-devel openbox-devel startup-notification-devel"
 depends="desktop-file-utils shared-mime-info"
 short_desc="A GTK2 based configuration tool for the Openbox windowmanager"

From 94d4fceea51ee713e65ca645a6130e17ec0028d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 07:03:16 +0200
Subject: [PATCH 010/298] openlierox: add python_version=2

---
 srcpkgs/openlierox/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openlierox/template b/srcpkgs/openlierox/template
index 153cb0bbbc8..33784034232 100644
--- a/srcpkgs/openlierox/template
+++ b/srcpkgs/openlierox/template
@@ -15,6 +15,7 @@ license="GPL-2"
 homepage="http://www.openlierox.net/"
 distfiles="${SOURCEFORGE_SITE}/openlierox/OpenLieroX_${version/.rc/_rc}.src.tar.bz2"
 checksum=3e029aba20f22d902027293e1f1a196e2f1794455cb2483d099709d7fb6c5fbb
+python_version=2
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 case "$XBPS_TARGET_MACHINE" in

From 6a006db305cd9772d593969b4774eb96f0060fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 07:27:10 +0200
Subject: [PATCH 011/298] surgescript: move pkgconfig files to -devel

---
 srcpkgs/surgescript/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/surgescript/template b/srcpkgs/surgescript/template
index 1a09c225007..54e0b761241 100644
--- a/srcpkgs/surgescript/template
+++ b/srcpkgs/surgescript/template
@@ -1,7 +1,7 @@
 # Template file for 'surgescript'
 pkgname=surgescript
 version=0.5.4.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 short_desc="Scripting language for games"
@@ -16,5 +16,6 @@ surgescript-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
 	}
 }

From ec068c7281264e1acb0a3da331d9ce9a751e89b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 07:30:12 +0200
Subject: [PATCH 012/298] common/shlibs: add surgescript-0.5.4.4 shlib

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 3f25e4a2861..f249f2b8f72 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -864,6 +864,7 @@ liblua5.1.so.5.1 lua51-5.1.5_1
 liblua5.2.so.5.2 lua52-5.2.4_2
 liblua5.3.so.5.3 lua53-5.3.5_4
 liblua5.4.so.5.4 lua54-5.4.0_1
+libsurgescript.so.0.5.4.4 surgescript-0.5.4.4_2
 libburn.so.4 libburn-0.7.2_1
 libKF5Auth.so.5 kauth-5.26.0_1
 libKF5AuthCore.so.5 kauth-5.56.0_1

From a2acba8e8aec08cdbc6b705cad8d185dfb64889f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 07:30:43 +0200
Subject: [PATCH 013/298] opensurge: needs surgescript in hostmakedepends

---
 srcpkgs/opensurge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template
index 4a5ede90414..48c2f659f28 100644
--- a/srcpkgs/opensurge/template
+++ b/srcpkgs/opensurge/template
@@ -3,7 +3,7 @@ pkgname=opensurge
 version=0.5.1.2
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="surgescript pkg-config"
 makedepends="allegro5-devel surgescript-devel"
 depends="opensurge-data>=0"
 short_desc="Retro platformer inspired by Sonic"

From 327704206efc27464e5b70b8d29599046b0fc574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 07:33:40 +0200
Subject: [PATCH 014/298] opensurge: revbump for surgescript shlib dependency

---
 srcpkgs/opensurge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template
index 48c2f659f28..05759a30d71 100644
--- a/srcpkgs/opensurge/template
+++ b/srcpkgs/opensurge/template
@@ -1,7 +1,7 @@
 # Template file for 'opensurge'
 pkgname=opensurge
 version=0.5.1.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="surgescript pkg-config"
 makedepends="allegro5-devel surgescript-devel"

From 1b6fd7b825a91975dfb013b748c1991ebe374515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 07:36:57 +0200
Subject: [PATCH 015/298] opensurge: needs surgescript also in makedepends

---
 srcpkgs/opensurge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template
index 05759a30d71..187cace09e6 100644
--- a/srcpkgs/opensurge/template
+++ b/srcpkgs/opensurge/template
@@ -4,7 +4,7 @@ version=0.5.1.2
 revision=2
 build_style=cmake
 hostmakedepends="surgescript pkg-config"
-makedepends="allegro5-devel surgescript-devel"
+makedepends="allegro5-devel surgescript surgescript-devel"
 depends="opensurge-data>=0"
 short_desc="Retro platformer inspired by Sonic"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From dab31a25edae0872928b44e082d20dcf617b563c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 07:45:51 +0200
Subject: [PATCH 016/298] pithos: add python_version=3

---
 srcpkgs/pithos/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/pithos/template b/srcpkgs/pithos/template
index 470967f188b..a8e8cfca214 100644
--- a/srcpkgs/pithos/template
+++ b/srcpkgs/pithos/template
@@ -12,3 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://pithos.github.io/"
 distfiles="https://github.com/pithos/pithos/releases/download/${version}/pithos-${version}.tar.xz"
 checksum=61e2a778252358519979ea53ab9fb9dd10a9554d24f3e249560bc4971f386133
+python_version=3

From a40271c2bf14199df30a76a5ca025ec611e01b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 08:05:30 +0200
Subject: [PATCH 017/298] plex-media-player: update to 2.58.0 + fix build

The template for Downloader::HeaderList append() expects
a QString instead of a const char*.
---
 .../patches/qt5-append-header.patch           | 16 +++++++++++
 srcpkgs/plex-media-player/template            | 27 ++++++++++---------
 2 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/plex-media-player/patches/qt5-append-header.patch

diff --git a/srcpkgs/plex-media-player/patches/qt5-append-header.patch b/srcpkgs/plex-media-player/patches/qt5-append-header.patch
new file mode 100644
index 00000000000..02ef423ec6c
--- /dev/null
+++ b/srcpkgs/plex-media-player/patches/qt5-append-header.patch
@@ -0,0 +1,16 @@
+--- src/player/CodecsComponent.cpp	2020-05-19 19:32:23.000000000 +0200
++++ src/player/CodecsComponent.cpp	2020-07-28 08:00:34.966060781 +0200
+@@ -684,9 +684,11 @@
+ {
+   Downloader::HeaderList headers;
+   QString auth = SystemComponent::Get().authenticationToken();
++  QString prod = WITH_CODECS ? "Plex Media Player" : "openpmp";
++  QString plat = "Konvergo";
+   if (auth.size())
+     headers.append({"X-Plex-Token", auth});
+-  headers.append({"X-Plex-Product", WITH_CODECS ? "Plex Media Player" : "openpmp"});
+-  headers.append({"X-Plex-Platform", "Konvergo"});
++  headers.append({"X-Plex-Product", prod});
++  headers.append({"X-Plex-Platform", plat});
+   return headers;
+ }
diff --git a/srcpkgs/plex-media-player/template b/srcpkgs/plex-media-player/template
index bd44fd76b56..8432c27fdb0 100644
--- a/srcpkgs/plex-media-player/template
+++ b/srcpkgs/plex-media-player/template
@@ -1,14 +1,15 @@
 # Template file for 'plex-media-player'
 pkgname=plex-media-player
-version=2.37.2.996
+version=2.58.0
 revision=1
-_commit_rev=bea4f9ca
+_verbuild=1076
+_commit_rev=38e019da
 # See CMakeModules/WebClient.cmake
-_buildid_version=132-156395a99cd699
+_buildid_version=183-045db5be50e175
 # See https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/buildid.cmake
-_clientdesktop_version=3.104.1-99cd699
-_clienttv_version=3.107.0-156395a
-wrksrc="plex-media-player-${version}-${_commit_rev}"
+_clientdesktop_version=4.29.2-e50e175
+_clienttv_version=4.29.6-045db5b
+wrksrc="plex-media-player-${version}.${_verbuild}-${_commit_rev}"
 build_style=cmake
 configure_args="-DQTROOT="${XBPS_CROSS_BASE}/usr" -DFULL_GIT_REVISION=${_commit_rev}"
 hostmakedepends="pkg-config python3"
@@ -20,18 +21,18 @@ short_desc="Next generation Plex Desktop/Embedded Client"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/plexinc/plex-media-player"
-distfiles="https://github.com/plexinc/plex-media-player/archive/v${version}-${_commit_rev}.tar.gz
+distfiles="https://github.com/plexinc/plex-media-player/archive/v${version}.${_verbuild}-${_commit_rev}.tar.gz
  https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/buildid.cmake>buildid-${_buildid_version}.cmake
  https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-desktop-${_clientdesktop_version}.tar.xz
  https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-desktop-${_clientdesktop_version}.tar.xz.sha1
  https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-tv-${_clienttv_version}.tar.xz
  https://artifacts.plex.tv/web-client-pmp/${_buildid_version}/web-client-tv-${_clienttv_version}.tar.xz.sha1"
-checksum="1c31b0057337a14bc1eea99f61a44b288b5b7e707f81a629cee941789e6b901a
- 6b516d498097f1e84d04eefbeaf519492081ed2df9673119b66089ff9822c6f6
- 5815709d80a66484043b68ec2b86473b165a3a64f855fd59b3d176440f8b210b
- 5da2c32325943426fad7a00d19ec109452beda7f2a2d112d0238c8c8b07aba98
- b0a153088d7e85b665b9acbe6ba08eeb230d36eb7ce95fd703f02dc3c57730e7
- a973210e2e428774d926f2bd044d709963800824c9e421981dd968cacd0020ce"
+checksum="f73ddae52d40eb5019283a16c83f4d5909dc1059ced85d6298e5525347705341
+ 0331e53bb67c4b14284fafbe3a98700c3438ece99b9e969bcb49a1d583674af7
+ c56c1784dd8de0fbda971b66e4fc19a6b91c154e9122213a7c0ef577613a94fe
+ eef51c4ee379ca914522b072832bad119bb831897958f985bab79097a1ef571f
+ e04b7d77804efb850f6abbec48982526f6fe727a74a143f73b83033672de3fb8
+ 53cbb948ec4fa73f073892ab6179481f1d17d3c165b2997aee1973739ee0eeff"
 skip_extraction="buildid-${_buildid_version}.cmake
  web-client-desktop-${_clientdesktop_version}.tar.xz
  web-client-desktop-${_clientdesktop_version}.tar.xz.sha1

From 093376bc89acb7c34156d53573681ab22626cfc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 28 Jul 2020 07:50:27 +0200
Subject: [PATCH 018/298] exiftool: update to 12.02.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 202d72adb46..f08b5529749 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.01
+version=12.02
 revision=1
 archs=noarch
 wrksrc="Image-ExifTool-${version}"
@@ -14,4 +14,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=1ab849ba41972fbdc608287da3112e779100ebb0961dd7b71449651407e3d586
+checksum=182c74ea3ec1113097f062a2ceb70f2555e3afb85ee7b7a4b7ec9db848915192

From a50c1d9ff59af4bbc432b40796270655cdd02e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 28 Jul 2020 06:54:54 +0200
Subject: [PATCH 019/298] postfix: update to 3.5.6.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index e49f7b368c5..9c85cb5880a 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.5.5
+version=3.5.6
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=dc2462a62fee5be82feb04391e5099755fe29ca28b75fa7f5c1ea1cfa7ffdac2
+checksum=8ec0aa671582adce157675e15da1dfa7ac2b5ff653571addba643735d0ec1e6a
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From 86a4a126325d0dcab45b07a893e2363c23b023b8 Mon Sep 17 00:00:00 2001
From: Daniel Santana <daniel@santana.tech>
Date: Tue, 28 Jul 2020 00:21:10 -0300
Subject: [PATCH 020/298] minikube: update to 1.12.1.

---
 srcpkgs/minikube/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index a820489b0bc..e03efdfa838 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,6 +1,6 @@
 # Template file for 'minikube'
 pkgname=minikube
-version=1.11.0
+version=1.12.1
 revision=1
 archs="x86_64* ppc64le*"
 build_wrksrc=src/k8s.io/minikube
@@ -13,6 +13,7 @@ short_desc="Tool to make it easy to run Kubernetes locally"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="Apache-2.0"
 homepage="https://github.com/kubernetes/minikube"
+changelog="https://raw.githubusercontent.com/kubernetes/minikube/master/CHANGELOG.md"
 
 do_fetch() {
 	# We must clone it instead of downloading the tarball because the build

From bb620b30613ffc5ffd2f5a0a870a09d77da12a3f Mon Sep 17 00:00:00 2001
From: Daniel Santana <daniel@santana.tech>
Date: Mon, 27 Jul 2020 23:51:00 -0300
Subject: [PATCH 021/298] pex: update to 2.1.14.

---
 srcpkgs/pex/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pex/template b/srcpkgs/pex/template
index 1b1b6e41359..0c269cc733a 100644
--- a/srcpkgs/pex/template
+++ b/srcpkgs/pex/template
@@ -1,6 +1,6 @@
 # Template file for 'pex'
 pkgname=pex
-version=2.1.12
+version=2.1.14
 revision=1
 archs=noarch
 wrksrc="pex-${version}"
@@ -11,8 +11,9 @@ short_desc="Library & tool for generating .pex (Python EXecutable) files"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="Apache-2.0"
 homepage="https://github.com/pantsbuild/pex"
+changelog="https://raw.githubusercontent.com/pantsbuild/pex/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/pex/pex-${version}.tar.gz"
-checksum=b84014ab576f2819830881b292854b98225f6063e8d93410086261e2d693d644
+checksum=de5e553086cf65241beee7c1f06b30867149511fa6e48c8d4493305c7ddaf69b
 
 post_build() {
 	PYTHONPATH="$PWD" make -C docs man

From 7ed45192f0e6649d3f1f114f68fdae579ab5bce5 Mon Sep 17 00:00:00 2001
From: Daniel Santana <daniel@santana.tech>
Date: Mon, 27 Jul 2020 23:47:21 -0300
Subject: [PATCH 022/298] google-cloud-sdk: update to 302.0.0.

---
 srcpkgs/google-cloud-sdk/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-cloud-sdk/template b/srcpkgs/google-cloud-sdk/template
index a2a0177f6c1..cc555662ff0 100644
--- a/srcpkgs/google-cloud-sdk/template
+++ b/srcpkgs/google-cloud-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'google-cloud-sdk'
 pkgname=google-cloud-sdk
-version=299.0.0
+version=302.0.0
 revision=1
 archs=noarch
 wrksrc=$pkgname
@@ -9,8 +9,9 @@ short_desc="Command-line interface for Google Cloud Platform products and servic
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="Apache-2.0"
 homepage="https://cloud.google.com/sdk"
+changelog="https://cloud.google.com/sdk/docs/release-notes"
 distfiles="https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/${pkgname}_${version}.orig.tar.gz"
-checksum=b1740c7fff6e9c5d89eed09b067b8228199123708fcfeeddca17707a6bc93457
+checksum=c2bdb6a093598411fb2a787c06c43548d1d7b4f80cadba8600d1f6861c02b7f1
 python_version=3
 
 do_install() {

From e360df8ca59cfcb9cb9a11ee424e9ed49e408251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 28 Jul 2020 01:49:23 +0200
Subject: [PATCH 023/298] youtube-dl: update to 2020.07.28.

---
 srcpkgs/youtube-dl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index adbc9b04654..8e35e276ee9 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2020.06.16.1
+version=2020.07.28
 revision=1
 archs=noarch
 wrksrc=youtube-dl
@@ -14,7 +14,7 @@ license="Unlicense"
 homepage="https://ytdl-org.github.io/youtube-dl/"
 changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
 distfiles="https://yt-dl.org/downloads/${version}/youtube-dl-${version}.tar.gz"
-checksum=fd06c016ce2a8b82a3cee245acc397433ddb54a276bdf8d79bcaddbe194000e0
+checksum=1fb3e34d80400464e55aeeb61256c36468116ad9efe82543b437a777a2efc7c5
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From e733623e4f65f787cbbabee1a59ef9971bad3799 Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Mon, 27 Jul 2020 13:46:29 -0500
Subject: [PATCH 024/298] python-botocore: update to 1.17.28

---
 srcpkgs/python-botocore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-botocore/template b/srcpkgs/python-botocore/template
index 4f499b7e666..600559839d2 100644
--- a/srcpkgs/python-botocore/template
+++ b/srcpkgs/python-botocore/template
@@ -1,6 +1,6 @@
 # Template file for 'python-botocore'
 pkgname=python-botocore
-version=1.15.26
+version=1.17.28
 revision=1
 archs=noarch
 wrksrc="botocore-${version}"
@@ -12,7 +12,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/boto/botocore"
 distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
-checksum=4535cf8a9b0cf9eea7ea50c003ca944f694f80b6a4b455466ab56dd8a000c613
+checksum=c9a4b4ffedeff89848a899bd4634be46a21a190690b505c2050888c0a5447936
 
 python3-botocore_package() {
 	archs=noarch

From 2d7ea4c89cf95dda7230f96b68bb873e26828a97 Mon Sep 17 00:00:00 2001
From: Robert Lowry <bobertlo@gmail.com>
Date: Mon, 27 Jul 2020 13:48:20 -0500
Subject: [PATCH 025/298] aws-cli: update to 1.18.105

---
 srcpkgs/aws-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index f8e020d11f8..c8fadf32d2e 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
-version=1.18.26
+version=1.18.105
 revision=1
 archs=noarch
 wrksrc="aws-cli-${version}"
@@ -13,7 +13,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aws/aws-cli"
 distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz"
-checksum=6d32a6d9d31bc861a63a74c9c8a74e3b4f3daf5b730bd09143c5e0c789094769
+checksum=d28068fca865b3a74324e7b13be14ecc97bec2334e7f1f3d69fa87b7ad5ec324
 
 post_install() {
 	vinstall bin/aws_bash_completer 644 usr/share/bash-completion/completions aws

From 58abfae418e79457dbca03acf5f9d4c92197d989 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Sun, 26 Jul 2020 22:52:46 -0700
Subject: [PATCH 026/298] pmbootstrap: update to 1.22.0.

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index a38f174e392..36878f266f8 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
-version=1.21.0
+version=1.22.0
 revision=1
 archs=noarch
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://postmarketos.org"
 distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz"
-checksum=0246b499ceaf486d096c8e9c07042516801c6f8f64d49169f950d59e2dcfe6c0
+checksum=5a9d5a854db17306031e76736dc7c1627eb190ee72d17ecde6dd3da86479703a
 
 do_check() {
 	# tests require chroot

From bdd1dec7316395e7aabb506eb9c6fda9fd4cf203 Mon Sep 17 00:00:00 2001
From: Alif Rachmawadi <arch@subosito.com>
Date: Thu, 9 Jul 2020 14:43:55 +0700
Subject: [PATCH 027/298] gimme: update to 1.5.4

---
 srcpkgs/gimme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimme/template b/srcpkgs/gimme/template
index a72a824f405..1893b659fae 100644
--- a/srcpkgs/gimme/template
+++ b/srcpkgs/gimme/template
@@ -1,6 +1,6 @@
 # Template file for 'gimme'
 pkgname=gimme
-version=1.5.3
+version=1.5.4
 revision=1
 archs=noarch
 depends="bash curl git"
@@ -9,7 +9,7 @@ maintainer="Alif Rachmawadi <arch@subosito.com>"
 license="MIT"
 homepage="https://github.com/travis-ci/gimme"
 distfiles="https://github.com/travis-ci/gimme/archive/v${version}.tar.gz"
-checksum=66b654f460efe9a697fdefda39fa73308f6e2f25393b28c7979724f28159a613
+checksum=71036f892b3cae08f29be6fd4c69fb20d9b003ec80a24221d73e995e12ab0fe0
 
 do_install() {
 	vlicense LICENSE

From ecd455f18162474135569f02dc05d581f2f9d0cd Mon Sep 17 00:00:00 2001
From: Gerardo Di Iorio <arete74@gmail.com>
Date: Sun, 26 Jul 2020 12:16:37 +0200
Subject: [PATCH 028/298] minio: update to 2020.07.24.

---
 srcpkgs/minio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 5d6b9a7b281..ca581eb0cf6 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2020.07.20
+version=2020.07.24
 revision=1
-_version="${version//./-}T02-25-16Z"
+_version="${version//./-}T22-43-05Z"
 wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/minio/minio"
 distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz"
-checksum=b22a0d3d3cab6c8f7ea11b1c3ceaca0c2dc123148c078c91cb90b358cd17f07e
+checksum=2b8d5b4dcc1ee27071588f82b42ad054794b29320910d6289f27871b0a3145c6
 system_accounts="_minio"
 _minio_homedir="/var/lib/minio"
 _minio_descr="Minio Daemon User"

From 92819058275b5d62af6e754caf9a83c39e00ba9a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 27 Jul 2020 01:13:18 +0300
Subject: [PATCH 029/298] wps-office: update to 11.1.0.9615.

---
 srcpkgs/wps-office/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 17452e7321a..887a52679fc 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,6 +1,6 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.9604
+version=11.1.0.9615
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=5f71bcaaf843a7ac41ea2c8e8d0774d7690849cc73e287bedf6d6cf892b744ac
+checksum=3b9e6c1f8f25b51ae08aad4a37bfd7fd25ce535479126833678b147c5f910252
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 #The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9604/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9615/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 

From 33cb6ed1203a4d60f40b3a5608f6459a6b966626 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 27 Jul 2020 21:47:38 +0200
Subject: [PATCH 030/298] chroma: update to 0.8.0.

---
 srcpkgs/chroma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index a2c769f52ea..958de7e3418 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,6 +1,6 @@
 # Template file for 'chroma'
 pkgname=chroma
-version=0.7.3
+version=0.8.0
 revision=1
 build_style=go
 go_import_path="github.com/alecthomas/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/alecthomas/chroma"
 distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=1007e82cc44cea04542c282b19bab25a59cb1e53149aaa7f0e2d9ce72ba80114
+checksum=03bbe1fd43109b125cb33cf72e26338376056b961ea1c9ab1ecc02a60651e67b
 
 do_check() {
 	go test -v

From dc4d5b5adba9dbead5210d4cc54a75def4093c55 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sun, 26 Jul 2020 09:19:10 -0400
Subject: [PATCH 031/298] oragono: update to 2.2.0.

---
 srcpkgs/oragono/patches/paths.patch | 12 ++++++------
 srcpkgs/oragono/template            |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch
index 6cb6c9dbb3a..c06f9fe2170 100644
--- a/srcpkgs/oragono/patches/paths.patch
+++ b/srcpkgs/oragono/patches/paths.patch
@@ -1,5 +1,5 @@
---- oragono.yaml.orig	2020-05-31 23:56:25.000000000 -0400
-+++ oragono.yaml	2020-06-01 01:16:15.192369452 -0400
+--- default.yaml.orig	2020-07-26 08:57:19.471641788 -0400
++++ default.yaml	2020-07-26 08:59:56.772839651 -0400
 @@ -50,8 +50,8 @@
          # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
          ":6697":
@@ -11,7 +11,7 @@
                  # 'proxy' should typically be false. It's only for Kubernetes-style load
                  # balancing that does not terminate TLS, but sends an initial PROXY line
                  # in plaintext.
-@@ -154,7 +154,7 @@
+@@ -159,7 +159,7 @@
  
      # motd filename
      # if you change the motd, you should move it to ircd.motd
@@ -20,7 +20,7 @@
  
      # motd formatting codes
      # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -685,7 +685,7 @@
+@@ -671,7 +671,7 @@
  # datastore configuration
  datastore:
      # path to the datastore
@@ -29,12 +29,12 @@
  
      # if the database schema requires an upgrade, `autoupgrade` will attempt to
      # perform it automatically on startup. the database will be backed
-@@ -714,7 +714,7 @@
+@@ -700,7 +700,7 @@
      default: en
  
      # which directory contains our language files
 -    path: languages
-+    path: /usr/share/oragono/i18n/
++    path: /usr/share/oragono/i18n
  
  # limits - these need to be the same across the network
  limits:
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index 18c118dd494..5dfc5128122 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,6 +1,6 @@
 # Template file for 'oragono'
 pkgname=oragono
-version=2.1.0
+version=2.2.0
 revision=1
 build_style=go
 go_import_path="github.com/oragono/oragono"
@@ -10,7 +10,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=adbdf8cd25a230e1144fba30b96e8fb7dd19b27d8e7e0d9e4ef5de73a362639d
+checksum=700c0936eb1ae037e17196140a7e66c6ff427a560080ee0335ce1f4b6c6397ce
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"
@@ -20,7 +20,7 @@ make_dirs="
  post_install() {
 	vlicense LICENSE
 
-	vconf oragono.yaml oragono.conf
+	vconf default.yaml oragono.conf
 
 	vmkdir usr/share/${pkgname}
 	vcopy oragono.motd usr/share/${pkgname}/default.motd

From e42055a0d69ceac0c477b4f361fb809567981d97 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 25 Jul 2020 16:03:50 +0400
Subject: [PATCH 032/298] bash-completion: update to 2.11

---
 srcpkgs/bash-completion/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template
index b2fac23917d..704b0784688 100644
--- a/srcpkgs/bash-completion/template
+++ b/srcpkgs/bash-completion/template
@@ -1,14 +1,14 @@
 # Template file for 'bash-completion'
 pkgname=bash-completion
-version=2.10
+version=2.11
 revision=1
 archs=noarch
 build_style=gnu-configure
 make_install_args="profiledir=/etc/bash/bashrc.d"
 depends="bash"
 short_desc="Programmable completion for the GNU Bash shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/scop/bash-completion"
 distfiles="https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz"
-checksum=123c17998e34b937ce57bb1b111cd817bc369309e9a8047c0bcf06ead4a3ec92
+checksum=73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac

From c129a26262fedfb96b758e80699c800c2b37b775 Mon Sep 17 00:00:00 2001
From: gt7-void <gt7@mail.com>
Date: Sun, 19 Jul 2020 23:48:36 -0300
Subject: [PATCH 033/298] libwebp-devel: do not depend on libfreeglut-devel

Although there is a (correct) makedepends on libfreeglut-devel, it is
only needed to compile the vwebp tool, so libwebp-devel should not
depend on it. This is very relevant since libfreeglut-devel deptree
includes a lot of unnecessary stuff (mesa, wayland, X libraries, etc.)
---
 srcpkgs/libwebp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libwebp/template b/srcpkgs/libwebp/template
index bd60bd12c61..b67a2fb6bf0 100644
--- a/srcpkgs/libwebp/template
+++ b/srcpkgs/libwebp/template
@@ -1,7 +1,7 @@
 # Template file for 'libwebp'
 pkgname=libwebp
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-libwebpmux
  --enable-libwebpdemux --enable-libwebpdecoder"
@@ -33,7 +33,7 @@ libwebp-tools_package() {
 }
 
 libwebp-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	depends="${makedepends/libfreeglut-devel/} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 30bf5867cf12a75151c0109385c233313ff0d9d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 25 Jul 2020 22:50:30 -0300
Subject: [PATCH 034/298] portaudio: try sndio as first audio device, adopt.

The changes to sndio.patch were:

- Put the sndio backend as the first one that PortAudio tries to
connect;
- Add return for cases when sndio isn't available so PortAudio can
fallback to other systems.
---
 srcpkgs/portaudio/patches/sndio.patch | 28 ++++++++++++++++-----------
 srcpkgs/portaudio/template            |  4 ++--
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/portaudio/patches/sndio.patch b/srcpkgs/portaudio/patches/sndio.patch
index 764916496e5..7e43e3fcedd 100644
--- a/srcpkgs/portaudio/patches/sndio.patch
+++ b/srcpkgs/portaudio/patches/sndio.patch
@@ -20,7 +20,7 @@ index 5e1a764..2747f73 100644
  	src/hostapi/wdmks \
  	src/hostapi/wmme \
 diff --git configure.in configure.in
-index 13816fb..4c06d10 100644
+index 83c239a..db11d65 100644
 --- configure.in
 +++ configure.in
 @@ -24,6 +24,10 @@ AC_ARG_WITH(alsa,
@@ -59,7 +59,7 @@ index 13816fb..4c06d10 100644
          if [[ "$have_jack" = "yes" ] && [ "$with_jack" != "no" ]] ; then
             DLL_LIBS="$DLL_LIBS $JACK_LIBS"
             CFLAGS="$CFLAGS $JACK_CFLAGS"
-@@ -509,6 +524,7 @@ case "$target_os" in
+@@ -510,6 +525,7 @@ case "$target_os" in
          ;;
       *)
  	AC_MSG_RESULT([
@@ -68,7 +68,7 @@ index 13816fb..4c06d10 100644
    JACK ........................ $have_jack
  ])
 diff --git include/portaudio.h include/portaudio.h
-index 8a94aaf..f94d9c4 100644
+index 9c8a295..e535a02 100644
 --- include/portaudio.h
 +++ include/portaudio.h
 @@ -287,7 +287,8 @@ typedef enum PaHostApiTypeId
@@ -86,7 +86,7 @@ new file mode 100644
 index 0000000..725ef47
 --- /dev/null
 +++ src/hostapi/sndio/pa_sndio.c
-@@ -0,0 +1,765 @@
+@@ -0,0 +1,768 @@
 +/*
 + * Copyright (c) 2009 Alexandre Ratchov <alex@caoua.org>
 + *
@@ -775,6 +775,9 @@ index 0000000..725ef47
 +
 +	DPR("PaSndio_Initialize: initializing...\n");
 +
++	if ((hdl=sio_open(SIO_DEVANY, SIO_PLAY, 1)) == NULL)
++		return paNoError;
++	sio_close(hdl);
 +	/* unusable APIs should return paNoError and a NULL hostApi */
 +	*hostApi = NULL;
 +
@@ -853,7 +856,7 @@ index 0000000..725ef47
 +	return paNoError;
 +}
 diff --git src/os/unix/pa_unix_hostapis.c src/os/unix/pa_unix_hostapis.c
-index a9b4a05..c3fa2a3 100644
+index a9b4a05..f10ced1 100644
 --- src/os/unix/pa_unix_hostapis.c
 +++ src/os/unix/pa_unix_hostapis.c
 @@ -44,6 +44,7 @@
@@ -864,14 +867,17 @@ index a9b4a05..c3fa2a3 100644
  PaError PaOSS_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
  /* Added for IRIX, Pieter, oct 2, 2003: */
  PaError PaSGI_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-@@ -79,6 +80,10 @@ PaUtilHostApiInitializer *paHostApiInitializers[] =
- 
- #endif  /* __linux__ */
+@@ -57,6 +58,10 @@ PaError PaSkeleton_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiI
  
+ PaUtilHostApiInitializer *paHostApiInitializers[] =
+     {
 +#ifdef PA_USE_SNDIO
 +	    PaSndio_Initialize,
 +#endif
 +
- #if PA_USE_JACK
-         PaJack_Initialize,
- #endif
+ #ifdef __linux__
+ 
+ #if PA_USE_ALSA
+-- 
+2.27.0
+
diff --git a/srcpkgs/portaudio/template b/srcpkgs/portaudio/template
index f53a2be340a..572be816257 100644
--- a/srcpkgs/portaudio/template
+++ b/srcpkgs/portaudio/template
@@ -1,14 +1,14 @@
 # Template file for 'portaudio'
 pkgname=portaudio
 version=190600.20161030
-revision=4
+revision=5
 wrksrc=portaudio
 build_style=gnu-configure
 configure_args="--enable-cxx --with-jack $(vopt_enable sndio)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="alsa-lib-devel jack-devel $(vopt_if sndio sndio-devel)"
 short_desc="Portable cross-platform audio I/O library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="http://www.portaudio.com"
 distfiles="http://www.${pkgname}.com/archives/pa_stable_v${version%.*}_${version#*.}.tgz"

From 05eba7b1250ca29c9e296705ddc36190c8fb8c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 25 Jul 2020 22:55:31 -0300
Subject: [PATCH 035/298] spotifyd: add portaudio build option.

This option is on by default.
---
 srcpkgs/spotifyd/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index 3d9c98f51cd..00b16675698 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,12 +1,13 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.2.24
-revision=3
+revision=4
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
 makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
-$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if dbus dbus-devel)"
+ $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
+ $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
@@ -14,8 +15,9 @@ homepage="https://github.com/Spotifyd/spotifyd"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=d3763f4647217a8f98ee938b50e141d67a5f3d33e9378894fde2a92c9845ef80
 
-build_options="alsa pulseaudio dbus"
-build_options_default="alsa pulseaudio dbus"
+build_options="alsa pulseaudio portaudio dbus"
+desc_option_portaudio="Enable PortAudio backend"
+build_options_default="alsa pulseaudio portaudio dbus"
 
 export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
 export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
@@ -23,6 +25,7 @@ export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
 _features="$(vopt_if alsa ',alsa_backend')"
 _features+="$(vopt_if pulseaudio ',pulseaudio_backend')"
 _features+="$(vopt_if dbus ',dbus_mpris,dbus_keyring')"
+_features+="$(vopt_if portaudio ',portaudio_backend')"
 
 if [ "$_features" ]; then
 	configure_args+=" --features $_features"

From 03be14b2df3f9ea27eb3c6625bc7eb852823bd7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 25 Jul 2020 10:17:01 +0700
Subject: [PATCH 036/298] gitattributes: don't show whitespace error on patches

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 7f24a8f81d0..8ddae6fce45 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,4 @@
 template linguist-language=bash
 common/shlibs merge=union
+*.patch whitespace=-space-before-tab,-trailing-space
+*.diff whitespace=-space-before-tab,-trailing-space

From fb85b5e464fcfe9955c18e78471bf1cf76f11739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 12:59:50 +0200
Subject: [PATCH 037/298] libcxx: needs clang-tools-extra in hostmakedepends

---
 srcpkgs/libcxx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template
index b32e56dfcdf..95a16bccf57 100644
--- a/srcpkgs/libcxx/template
+++ b/srcpkgs/libcxx/template
@@ -7,8 +7,8 @@ build_style=cmake
 configure_args+=" -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON
  -DLIBCXX_CXX_ABI_LIBRARY_PATH=${XBPS_CROSS_BASE}/usr/lib
  -DLIBCXXABI_USE_LLVM_UNWINDER=1"
-hostmakedepends="llvm10 python3"
-makedepends="libcxxabi-devel llvm llvm-libunwind-devel"
+hostmakedepends="llvm10 clang-tools-extra python3"
+makedepends="libcxxabi-devel llvm10 llvm-libunwind-devel"
 make_build_args="VERBOSE=1"
 short_desc="New implementation of the C++ standard library, targeting C++11, C++14 and above"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 10733708e6873e14537b5387f1f75faee486b348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 13:39:38 +0200
Subject: [PATCH 038/298] synfig: fix build

---
 srcpkgs/synfig/patches/libxml-no-c-linkage.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/synfig/patches/libxml-no-c-linkage.patch

diff --git a/srcpkgs/synfig/patches/libxml-no-c-linkage.patch b/srcpkgs/synfig/patches/libxml-no-c-linkage.patch
new file mode 100644
index 00000000000..e32182c2baa
--- /dev/null
+++ b/srcpkgs/synfig/patches/libxml-no-c-linkage.patch
@@ -0,0 +1,13 @@
+--- src/synfig/savecanvas.cpp	2018-09-08 08:07:57.000000000 +0200
++++ src/synfig/savecanvas.cpp	2020-07-28 13:33:42.369091915 +0200
+@@ -70,10 +70,7 @@
+ #include <ETL/stringf>
+ #include "gradient.h"
+ #include <errno.h>
+-
+-extern "C" {
+ #include <libxml/tree.h>
+-}
+ 
+ #endif
+ 

From c061112a60bf1329bdb904bc9390959d0158c7ee Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Mon, 22 Jun 2020 08:45:09 +0200
Subject: [PATCH 039/298] vscode: update to 1.47.3. [ci skip]

---
 srcpkgs/vscode/patches/remove_git_command.patch | 10 ++++++++++
 srcpkgs/vscode/template                         |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vscode/patches/remove_git_command.patch

diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
new file mode 100644
index 00000000000..a99643c055f
--- /dev/null
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -0,0 +1,10 @@
+diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
+index ef8fa4a47f66..7b8b710636a7 100644
+--- a/build/npm/postinstall.js
++++ b/build/npm/postinstall.js
+@@ -73,5 +73,3 @@ yarnInstall('test/automation'); // node modules required for smoketest
+ yarnInstall('test/smoke'); // node modules required for smoketest
+ yarnInstall('test/integration/browser'); // node modules required for integration
+ yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
+-
+-cp.execSync('git config pull.rebase true');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index d870454e6f9..9624022dcd0 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.46.0
+version=1.47.3
 revision=1
 hostmakedepends="pkg-config python nodejs-lts-10 yarn tar"
 makedepends="libxkbfile-devel libsecret-devel"
@@ -10,7 +10,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=5bf4d51773bb26a484e0063b668cba38b5f7451cb77be230fbf64fa44d498ad8
+checksum=463c8d5c3e02035ada5c0b9dcbb8718841fa27f6258838bfa4bab3a916ca16f3
 patch_args="-Np1"
 
 # Due to electron

From 1c9008d17402f744ef3f244535045ee94707233c Mon Sep 17 00:00:00 2001
From: Felix Kleinschmidt <fk@bsrd.io>
Date: Tue, 28 Jul 2020 13:24:42 +0200
Subject: [PATCH 040/298] amdvlk: update to 2020.Q3.2

---
 srcpkgs/amdvlk/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 2e8df9aecc7..2c27f9d6917 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,12 +1,12 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2020.Q3.1
+version=2020.Q3.2
 revision=1
-_llpc_commit=be51df411e14ae19145ab046f95338ed38243b91
-_xgl_commit=9a577aa9c496e2c77844fb91ede978da25b5afd3
-_pal_commit=6604885c5d60be4a29346f1774a6f7e331879428
-_llvm_project_commit=56e1f9b8df3d414ab7acc2fa07272d318725d440
-_spvgen_commit=e0e6fdae66d8e2cd9949e514f4e6ce6c7e21cce9
+_llpc_commit=9acb06852cdf043b0e7b6867800be3cc3bf61383
+_xgl_commit=39a4e9c63456ed421b1704179730e95883f26a1b
+_pal_commit=ea5db60841dab7d067f5010f28a980ef222bdf81
+_llvm_project_commit=319fe935a7a607e83d2885c881ae5aeff9b08b22
+_spvgen_commit=34ba176fc2fa8a9997a8a7bd0c731259e2578854
 _MetroHash_commit=712f76fee75d69b23a1ea8f6465752c3ccaaf9a2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
 archs="i686* x86_64*"
@@ -31,12 +31,12 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="e487b4bd0ae9fc4977262792b6d479a690c2937eb7f9124284d0891943db8a7f
- ca8fe842915ec741ccd2148c2ebfb30b4ae6827e6e2f095943cb46d978af4f4e
- d6566101eb17aa2179a8e02dc4e80466dea9e22a45ce0b68234bf824901f84b3
- b5b046adb40814d63262530bb791bcf8fd7df79aac3b9ab14f1bdfcb4d7a14c8
- 217547fc89f6f9a6183da283f5f1d9dda2ed93e36af958dde7b302ac1b2fbac5
- 0dc5f19f39fcf0537d74f3871f0aba78092aeeb22bfeb8b9da51403296c63bc3
+checksum="1454cbd6ffe1ff2450eecda46421254c983e143ba1b55d993056e990eb942e80
+ 386706dc0b5cb84496f0808411f54818ac3372bf06d3e9dc2ca6e3a4c8e33d6c
+ 0ae20e3e71eb2b4a55f54d612528ce2b536cb91f968eb7bc092d1c178b83b4c8
+ f81381205dd58d71798fcb49749f4fb8821a37bffaaf6daa167f8787103a11fb
+ 49a29572c84d39e6a412de1f2716113ab5dc68fd21db68dff76350b1367a0708
+ dfa91b8e0dedbda5b27578be50f03dbf6bc4bb337a6c379847a90138952f6f59
  07c7389894a4acd9aff7ddb6d70fc3ea6a4cc10589b69ce92c737487cbe2d37d
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
 nocross=yes

From 39e61d2716a4a0fb3bded21a59517a65ed41e697 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 7 Apr 2020 12:31:34 +0300
Subject: [PATCH 041/298] Marker: update to 2020.04.04.

---
 srcpkgs/Marker/patches/elf_files_in_lib.patch | 19 ++++++++++++++++
 srcpkgs/Marker/template                       | 22 ++++++++++++++-----
 2 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/Marker/patches/elf_files_in_lib.patch

diff --git a/srcpkgs/Marker/patches/elf_files_in_lib.patch b/srcpkgs/Marker/patches/elf_files_in_lib.patch
new file mode 100644
index 00000000000..63d2cc5f696
--- /dev/null
+++ b/srcpkgs/Marker/patches/elf_files_in_lib.patch
@@ -0,0 +1,19 @@
+diff -ruN Marker/meson.build Marker1/meson.build
+--- Marker/meson.build	2019-11-06 14:44:46.000000000 +0200
++++ Marker1/meson.build	2019-12-06 22:39:56.434367811 +0200
+@@ -5,13 +5,14 @@
+
+ PREFIX = get_option('prefix')
+ DATA_DIR = join_paths(PREFIX, 'share')
++LIBS_DIR = join_paths(PREFIX, 'lib')
+ APP_DIR = join_paths(DATA_DIR, 'com.github.fabiocolacio.marker')
+ ICONS_DIR = join_paths(APP_DIR, 'icons')
+ STYLES_DIR = join_paths(APP_DIR, 'styles')
+ COMMON_DIR = join_paths(APP_DIR, 'common')
+ SCRIPTS_DIR = join_paths(APP_DIR, 'scripts')
+ HIGHLIGHT_STYLES_DIR = join_paths(join_paths(SCRIPTS_DIR, 'highlight'),'styles')
+-WEB_EXTENSIONS_DIRECTORY = join_paths(APP_DIR, 'extensions')
++WEB_EXTENSIONS_DIRECTORY = join_paths(LIBS_DIR, 'Marker.extensions')
+ APPDATA_DIR = join_paths(DATA_DIR, 'metainfo')
+ LOCALE_DIR = join_paths(PREFIX, get_option('localedir'))
+
diff --git a/srcpkgs/Marker/template b/srcpkgs/Marker/template
index 20360623fda..2c57664b3c6 100644
--- a/srcpkgs/Marker/template
+++ b/srcpkgs/Marker/template
@@ -1,16 +1,26 @@
 # Template file for 'Marker'
 pkgname=Marker
-version=2018.07.03
+version=2020.04.04
 revision=1
 wrksrc=marker
 build_style=meson
-hostmakedepends="glib-devel pkg-config unzip"
+hostmakedepends="glib-devel pkg-config"
 makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel
  webkit2gtk-devel"
-short_desc="A gtk3 markdown editor"
+depends="iso-codes"
+short_desc="Gtk3 markdown editor"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
+license="GPL-3.0-or-later, ISC"
 homepage="https://fabiocolacio.github.io/Marker/"
 distfiles="https://github.com/fabiocolacio/Marker/releases/download/${version}/marker.zip"
-checksum=9038a2f8b976e6bfb199d14dbf60e7281b66e5ee94a6333ca48e89e63e6096ef
-broken="fails lint (ELF in /usr/share/com.github.fabiocolacio.marker/extensions/libscroll-extension.so)"
+checksum=ca493e7e94f171c15f7ffc9f697ce265d3b4fdb20fae157601d091d89dd6fb40
+patch_args="-Np1"
+
+post_extract() {
+	# don't include bundled mathjax
+	rm -rf data/scripts/mathjax
+}
+
+post_install() {
+	vlicense src/scidown/LICENSE scidown.LICENSE
+}

From ad8a2062dd59c56037d4ad8cd4e79d26052d8692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 16:46:25 +0200
Subject: [PATCH 042/298] XyGrib: fix build w/ qt5-5.15.0

---
 srcpkgs/XyGrib/patches/qt5-5.15.0.patch | 10 ++++++++++
 srcpkgs/XyGrib/template                 |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/XyGrib/patches/qt5-5.15.0.patch

diff --git a/srcpkgs/XyGrib/patches/qt5-5.15.0.patch b/srcpkgs/XyGrib/patches/qt5-5.15.0.patch
new file mode 100644
index 00000000000..7cbc1757e4e
--- /dev/null
+++ b/srcpkgs/XyGrib/patches/qt5-5.15.0.patch
@@ -0,0 +1,10 @@
+--- src/SkewT.h	2019-07-05 11:01:01.000000000 +0200
++++ src/SkewT.h	2020-07-28 16:08:15.572570312 +0200
+@@ -16,6 +16,7 @@
+ #include <QMainWindow>
+ #include <QFrame>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLayout>
+ #include <QKeyEvent>
+ #include <QPrintDialog>
diff --git a/srcpkgs/XyGrib/template b/srcpkgs/XyGrib/template
index c5b07741a91..203d0fc9f58 100644
--- a/srcpkgs/XyGrib/template
+++ b/srcpkgs/XyGrib/template
@@ -12,7 +12,6 @@ license="GPL-3.0-or-later"
 homepage="https://opengribs.org/"
 distfiles="https://github.com/opengribs/XyGrib/archive/v${version}.tar.gz"
 checksum=2dc6099293ae6f7a4bfbfc0cab590cf7ad48241d608e6d7a76e35961b9fc2157
-patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="LINK=${XBPS_CROSS_TRIPLET}-c++"

From dac89a9c18af0571fdc9afec036bef19e6fa68bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 28 Jul 2020 17:13:17 +0200
Subject: [PATCH 043/298] qpdfview: fix build w/ qt5-5.15.0

---
 srcpkgs/qpdfview/patches/qt5-5.15.0.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/qpdfview/patches/qt5-5.15.0.patch

diff --git a/srcpkgs/qpdfview/patches/qt5-5.15.0.patch b/srcpkgs/qpdfview/patches/qt5-5.15.0.patch
new file mode 100644
index 00000000000..f4249f23337
--- /dev/null
+++ b/srcpkgs/qpdfview/patches/qt5-5.15.0.patch
@@ -0,0 +1,10 @@
+--- sources/model.h	2019-07-24 21:18:33.000000000 +0200
++++ sources/model.h	2020-07-28 17:11:17.441765416 +0200
+@@ -27,6 +27,7 @@
+ #include <QtPlugin>
+ #include <QWidget>
+ #include <QVector>
++#include <QPainterPath>
+ 
+ class QAbstractItemModel;
+ class QColor;

From 09507332e3aa0b1ac74af92820d1d5e48e326120 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 27 Jul 2020 10:59:14 -0400
Subject: [PATCH 044/298] New package: wlr-randr-0.1.0

---
 srcpkgs/wlr-randr/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/wlr-randr/template

diff --git a/srcpkgs/wlr-randr/template b/srcpkgs/wlr-randr/template
new file mode 100644
index 00000000000..b40866b7183
--- /dev/null
+++ b/srcpkgs/wlr-randr/template
@@ -0,0 +1,17 @@
+# Template file for 'wlr-randr'
+pkgname=wlr-randr
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel"
+short_desc="Wayland clone of xrandr for wlroots compositors"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://github.com/emersion/wlr-randr"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=dbf2f02aa4d4f48dc9cef1edd1137a8ee68daa85f3c824a28c92376fd1591844
+
+post_install() {
+	vlicense LICENSE
+}

From 2313cec8f3c4dc2cf0f1e71df7fffa4d05749c1e Mon Sep 17 00:00:00 2001
From: SolitudeSF <solitudesf@protonmail.com>
Date: Tue, 28 Jul 2020 11:58:04 +0300
Subject: [PATCH 045/298] kitty: update to 0.18.2

---
 srcpkgs/kitty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 7bfa3ec69ea..a186a412011 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.18.1
+version=0.18.2
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="ncurses pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=02e144d0a1d18b0d094c50108b782f7318d687f7080be0bbd707419f5551cb89
+checksum=b077b34f3773f698063b85ec96ff9c4598ad5ab86c8580cdda4ec551df121e09
 patch_args="-Np1"
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"

From 5ac189a53ea213b9799e3ec630b29b7ae4175dba Mon Sep 17 00:00:00 2001
From: lxeiqr <lxeiqr@protonmail.com>
Date: Mon, 29 Jun 2020 00:53:36 +0000
Subject: [PATCH 046/298] mpd: update to 0.21.25, add shoutcast support

Closes #23292
---
 srcpkgs/mpd/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 3800902e45c..80a256af988 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,12 +1,12 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.21.24
+version=0.21.25
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
  -Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
- -Dchromaprint=disabled -Dsoxr=enabled -Dshout=disabled -Dadplug=disabled
+ -Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
  -Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
  -Dshine=disabled -Ddocumentation=true -Daudiofile=enabled -Dtremor=disabled
  -Dsolaris_output=disabled
@@ -14,7 +14,7 @@ configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dao=$(vopt_if libao enabled disabled) -Dmpcdec=$(vopt_if mpcdec enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled) -Dpulse=$(vopt_if pulseaudio enabled disabled)
  -Dwavpack=$(vopt_if wavpack enabled disabled) -Dcdio_paranoia=$(vopt_if cdio enabled disabled)
- -Dopenal=$(vopt_if openal enabled disabled)"
+ -Dopenal=$(vopt_if openal enabled disabled) -Dshout=$(vopt_if shoutcast enabled disabled)"
 conf_files="/etc/mpd.conf"
 hostmakedepends="pkg-config"
 makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
@@ -22,7 +22,7 @@ makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
  libmodplug-devel libmpdclient-devel libnfs-devel libsamplerate-devel
  libsoup-devel libupnp1.8-devel mpg123-devel opus-devel yajl-devel
  zziplib-devel libsoxr-devel audiofile-devel twolame-devel
- $(vopt_if cdio 'libcdio-paranoia-devel')
+ $(vopt_if cdio 'libcdio-paranoia-devel') $(vopt_if shoutcast 'libshout-devel')
  $(vopt_if jack 'jack-devel') $(vopt_if lame 'lame-devel')
  $(vopt_if libao 'libao-devel') $(vopt_if mpcdec 'libmpcdec-devel')
  $(vopt_if pulseaudio 'pulseaudio-devel') $(vopt_if sndio 'sndio-devel')
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=84632a7e82e672b3a6d71651a75d05fb7acd62645c33e3f3af5a1067cfa64cd6
+checksum=20a0ad01bf327b2dbeb6ae8e1af952cb0de83d2d63fab0fa4b7183a74765c201
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
@@ -47,10 +47,10 @@ make_dirs="
  /var/lib/mpd/playlists 0755 mpd mpd"
 
 # Package build options
-build_options="jack lame mpcdec pulseaudio libao wavpack sndio cdio openal"
+build_options="jack lame mpcdec pulseaudio libao wavpack sndio cdio openal shoutcast"
 desc_option_cdio="Enable libcdio_paranoia input plugin"
 desc_option_openal="Enable OpenAL output plugin"
-build_options_default="jack pulseaudio libao sndio cdio"
+build_options_default="jack pulseaudio libao sndio cdio shoutcast"
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtest=true"

From 9f6248da65c6f61824b52adee54259e5a8d6e724 Mon Sep 17 00:00:00 2001
From: selfisekai <laura@selfisekai.rocks>
Date: Tue, 28 Jul 2020 16:42:18 +0200
Subject: [PATCH 047/298] new package: onedrive-2.4.3

---
 srcpkgs/onedrive-d          |  1 +
 srcpkgs/onedrive-d/template | 28 ----------------------------
 srcpkgs/onedrive/template   | 26 ++++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 28 deletions(-)
 create mode 120000 srcpkgs/onedrive-d
 delete mode 100644 srcpkgs/onedrive-d/template
 create mode 100644 srcpkgs/onedrive/template

diff --git a/srcpkgs/onedrive-d b/srcpkgs/onedrive-d
new file mode 120000
index 00000000000..fee711d1d52
--- /dev/null
+++ b/srcpkgs/onedrive-d
@@ -0,0 +1 @@
+onedrive
\ No newline at end of file
diff --git a/srcpkgs/onedrive-d/template b/srcpkgs/onedrive-d/template
deleted file mode 100644
index 7d744fbf38c..00000000000
--- a/srcpkgs/onedrive-d/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'onedrive-d'
-pkgname=onedrive-d
-version=1.1.3
-revision=1
-wrksrc="onedrive-${version}"
-build_style=gnu-makefile
-hostmakedepends="dmd"
-makedepends="libcurl-devel sqlite-devel"
-short_desc="Free Client for OneDrive on Linux"
-maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/skilion/onedrive"
-changelog="https://raw.githubusercontent.com/skilion/onedrive/master/CHANGELOG.md"
-distfiles="https://github.com/skilion/onedrive/archive/v${version}.tar.gz"
-checksum=fb12235a73919b3374b8f27785b834a690fba1c6e70c6e6f1f5da3e51eb471a0
-nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/3910/steps/shell_3/logs/stdio"
-
-pre_build() {
-	printf 'v%s\n' "$pkgver" > version
-	sed -i '/^onedrive:/ s/version //' Makefile
-	sed -i 's/std\.c\./core.stdc./g' src/sqlite.d
-}
-
-post_install() {
-	vinstall config 644 usr/share/onedrive config.default
-	# We don't care about the systemd service installed here.
-	rm -rf ${DESTDIR}/usr/lib/systemd
-}
diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template
new file mode 100644
index 00000000000..85923b540c3
--- /dev/null
+++ b/srcpkgs/onedrive/template
@@ -0,0 +1,26 @@
+# Template file for 'onedrive'
+pkgname=onedrive
+version=2.4.3
+revision=1
+build_style=gnu-configure
+configure_args="DC=ldc2"
+hostmakedepends="ldc pkg-config"
+makedepends="libcurl-devel sqlite-devel libnotify-devel"
+short_desc="OneDrive Client for Linux"
+maintainer="selfisekai <laura@selfisekai.rocks>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abraunegg/onedrive"
+changelog="https://raw.githubusercontent.com/abraunegg/onedrive/v${version}/CHANGELOG.md"
+distfiles="https://github.com/abraunegg/onedrive/archive/v${version}.tar.gz"
+checksum=4236f436b3658e360164d945a8bc5c9620539c1339ef9182e3d060d2e3b90b9b
+nocross="uses host flags for cross compilations"
+
+post_install() {
+	vinstall config 644 usr/share/onedrive config.default
+}
+
+onedrive-d_package() {
+	build_style=meta
+	depends="${sourcepkg}"
+	short_desc+=" (transitional dummy package)"
+}

From c9b589709084da9826dbc3a5201302b20de35f1d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 27 Jul 2020 21:49:47 +0400
Subject: [PATCH 048/298] libspectre: update to 0.2.9.

---
 srcpkgs/libspectre/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libspectre/template b/srcpkgs/libspectre/template
index 00d829edfe6..2cf8e03f1c6 100644
--- a/srcpkgs/libspectre/template
+++ b/srcpkgs/libspectre/template
@@ -1,16 +1,16 @@
 # Template file for 'libspectre'
 pkgname=libspectre
-version=0.2.8
-revision=2
+version=0.2.9
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="ghostscript-devel"
 short_desc="Small library for rendering Postscript documents"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libspectre/"
 distfiles="http://libspectre.freedesktop.org/releases/${pkgname}-${version}.tar.gz"
-checksum=65256af389823bbc4ee4d25bfd1cc19023ffc29ae9f9677f2d200fa6e98bc7a8
+checksum=49ae9c52b5af81b405455c19fe24089d701761da2c45d22164a99576ceedfbed
 
 libspectre-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 3e0a4e6f22f01405a68b4354773b7a705477771a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 22 Jul 2020 14:54:22 -0300
Subject: [PATCH 049/298] akonadi5: enable tests.

Tests require D-Bus, so it's necessary to run them with
dbus-run-session. Specific failing tests are disabled.
---
 srcpkgs/akonadi5/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 587c3757958..6543ca37c14 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -11,6 +11,7 @@ makedepends="qt5-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
  kdbusaddons-devel kiconthemes-devel kitemmodels-devel kio-devel sqlite-devel
  kaccounts-integration-devel libaccounts-qt5-devel qt5-tools-devel"
 depends="shared-mime-info"
+checkdepends="dbus ${depends}"
 short_desc="PIM layer providing an asynchronous API to access PIM data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
@@ -44,7 +45,11 @@ pre_build() {
 }
 
 do_check() {
-	: # require dbus
+	# failing tests are disabled - sqlite tests hang on futex
+	cd build
+	QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \
+		dbus-run-session ctest -E \
+		"(akonadixml-xmldocument|mimetypechecker|AkonadiControl-agenttype|.*sqlite.*)test"
 }
 
 akonadi5-devel_package() {

From 6f4c59bf0cdfb116b7709b4c771ad4b414066d37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:51:42 +0200
Subject: [PATCH 050/298] bluedevil: update to 5.19.4

[ci skip]
---
 srcpkgs/bluedevil/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index 49ef5cc5e24..cb626e46371 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,9 +10,9 @@ makedepends="bluez-qt5-devel kded-devel kio-devel plasma-framework-devel"
 short_desc="KDE Bluetooth integration"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/bluedevil"
+homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e9ddb2734807ef239e562399a6d9cbebf841da3f39d930f892e79e568976ed74
+checksum=19230517f7b9d0163001ce60f8a895962967f9259320d2a9454868e5ec3a9a5e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 45276f3ca66ad71abc7d1498fb12263ce3ff6918 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:51:45 +0200
Subject: [PATCH 051/298] breeze-gtk: update to 5.19.4

[ci skip]
---
 srcpkgs/breeze-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index cd54f7eb164..9bc02ed5fb4 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -8,9 +8,9 @@ makedepends="qt5-devel breeze"
 short_desc="A GTK Theme Built to Match KDE's Breeze"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/breeze-gtk"
+homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1bdd68c224b01ae9d804cc4b341295f622db579c88ebaffb0c847b773893c2cc
+checksum=42d300f78eaf61cc56cb4961231aaafc1fa509ed93e3771b7afdcc1643d81aa9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 3d0a2daceddc72e75003f63006d762de55281b16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:51:50 +0200
Subject: [PATCH 052/298] breeze: update to 5.19.4

[ci skip]
---
 srcpkgs/breeze/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index dc5f7fe1c40..03dbbb2240b 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,9 +12,9 @@ depends="breeze-icons frameworkintegration breeze-snow-cursor-theme"
 short_desc="Breeze visual style for the Plasma Desktop"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/breeze"
+homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fd2f22b872af10d1c990e773e31d9db1cca92fd717336f6fc04a01b812a4e650
+checksum=02171c903d2fc7ec7b6a25c9507290602be3f0f195fcd9388ff0db421415ff11
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 8f74472a9c708986827652aa7e19511f40068302 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:51:53 +0200
Subject: [PATCH 053/298] kactivitymanagerd: update to 5.19.4

[ci skip]
---
 srcpkgs/kactivitymanagerd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 779fac0b6d1..80336f683c2 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,9 +10,9 @@ makedepends="kio-devel boost-devel qt5-plugin-mysql qt5-plugin-odbc
 short_desc="Manage user's activities and track the usage patterns"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/kactivitymanagerd"
+homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d1566fc2069eec4a4f891b86b24576c8baf61c49b17bcea740fa6760e6e1b989
+checksum=76c9ed3b5e984639909968e04c3d498c9aba36fb97e62fd5b37360b34216baf8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUN_RESULT_VAR=0"

From e8653a7d4602813dc52a05ca423338d95fd4a2f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:52:51 +0200
Subject: [PATCH 054/298] kde-cli-tools: update to 5.19.4

[ci skip]
---
 srcpkgs/kde-cli-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 6a1962c315c..bc8fb031aeb 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,9 +11,9 @@ depends="xdg-utils"
 short_desc="KDE CLI tools"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
-homepage="https://cgit.kde.org/kde-cli-tools.git"
+homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b5e9cc334051fd8cd3c58aef15fb80b27a66c1bd7d00e3b1b741cab610f74b2d
+checksum=7e2ca40fc2b96c4c943b6908deb46147f891b32237a63de87a235552bca47eb8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools kcoreaddons python qt5-host-tools qt5-qmake"

From e435f424da720501781c49c366649bdfd0385e2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:52:53 +0200
Subject: [PATCH 055/298] kde-gtk-config5: update to 5.19.4

[ci skip]
---
 srcpkgs/kde-gtk-config5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index eaad595091c..0237c91c961 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.19.3
+version=5.19.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,9 +13,9 @@ depends="kde-cli-tools gsettings-desktop-schemas"
 short_desc="GTK2 and GTK3 Configurator for KDE"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/kde-gtk-config"
+homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=55e6f47399ff0ce8f79591c89b25b417e943fd0b0de3f96ba6502ed52d923aeb
+checksum=0df5feaf437b1a89c92df225e5cb6f18f3729ae87509c3d162c34c5e0526229d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 6a0e353d5b0da4e8dfa97a5dfc3ffbe14b4f8b83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:52:56 +0200
Subject: [PATCH 056/298] kdecoration: update to 5.19.4

[ci skip]
---
 srcpkgs/kdecoration/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 01bbc3f5c03..eab4b3ac9af 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,9 +9,9 @@ makedepends="qt5-devel ki18n-devel"
 short_desc="KDE Plugin based library to create window decorations"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/kdecoration"
+homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b9e2f64e5ac35aa5a1552696e51cc71da84335df668456797294648d9c3f15a0
+checksum=e4b2553d3b67e8c31c30a6c0748e2e1435b6b9c5790f17188c669723d356531e
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 370d2b6f9c139b4b1b51a8c690546451402e4593 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:52:58 +0200
Subject: [PATCH 057/298] kdeplasma-addons5: update to 5.19.4

[ci skip]
---
 srcpkgs/kdeplasma-addons5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index bba30fb626a..67013dd8c35 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.19.3
+version=5.19.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,9 +12,9 @@ makedepends="kross-devel kdesignerplugin-devel kdoctools-devel kholidays-devel
 short_desc="Various Plasma addons"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/kdeplasma-addons"
+homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=da062805c959ea1a4ad75691936a221e5380640509d17900398cb57915f92965
+checksum=91e1fdef2f03201f9d35003d895836649ad88e36fa18307349650ba0ef40f3de
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 041ec18cf8ab8327041e6b7d0160c2f96aef589a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:53:01 +0200
Subject: [PATCH 058/298] kgamma5: update to 5.19.4

[ci skip]
---
 srcpkgs/kgamma5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 9f58ef0a209..7850be029e0 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,9 +9,9 @@ makedepends="kdesignerplugin-devel kdelibs4support-devel kdoctools-devel"
 short_desc="KDE gamma adjustiment app"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/kgamma5"
+homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=918f4e0146f088d96bea87f7c8b3842633680c816b82a3070831d5b2d492bd94
+checksum=df2fd804d7a8a138d5a8d355a921162c4cb91bdd30d443fee8dab62bd40c9647
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From 4e6b91056bd68b8d8d75d2b75325f9cc884da485 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:53:04 +0200
Subject: [PATCH 059/298] khotkeys: update to 5.19.4

[ci skip]
---
 srcpkgs/khotkeys/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 7e0a39eefc4..9aa42802b2f 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,9 +10,9 @@ makedepends="kdesignerplugin-devel kdoctools plasma-workspace-devel"
 short_desc="KDE Hotkeys"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/khotkeys"
+homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5664d7426facfae99b9f905c22f4ef8c7c1056f14d2a7f0d7f523585cc9c4d6
+checksum=816501642267252180110865f0ec6918c9604820f24856dc6d1245ec45956932
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 17d0819dd92c9f61409d775f629a211fc000df09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:53:06 +0200
Subject: [PATCH 060/298] kinfocenter: update to 5.19.4

[ci skip]
---
 srcpkgs/kinfocenter/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index a78c5d0bee8..a6412ef6b81 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,9 +12,9 @@ depends="hwids"
 short_desc="KDE Info Center"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
-homepage="https://projects.kde.org/projects/plasma/kinfocenter"
+homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=88d1d496c4bdb69eb1cc093f81cce98658e863235ae668a854513b12b3d33eb9
+checksum=0fa59a49ef26c0a096e80498947557cc11e1458a17570b85b54754ac3cb2846b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From a5327be61b016a92e8878517a2f91519ab70393a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:53:09 +0200
Subject: [PATCH 061/298] kmenuedit: update to 5.19.4

[ci skip]
---
 srcpkgs/kmenuedit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 0289bc30075..97184827459 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,6 +11,6 @@ depends="khotkeys"
 short_desc="KDE Menu editor"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2"
-homepage="https://projects.kde.org/projects/plasma/kmenuedit"
+homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=668c2306b2020bcdb1eb8cb42d5de57e17e2c539f785fc6085dc2cdfaa98aabd
+checksum=597d831f6f5c0d1f8d1a63d7ce9859aeeda9f9bfc5c12aa2abe4a610e717479d

From e220aa1cc4d76076806bac251275c4c2878021f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:53:11 +0200
Subject: [PATCH 062/298] kscreen: update to 5.19.4

[ci skip]
---
 srcpkgs/kscreen/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 7bb69274320..9d9615ea49a 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,9 +12,9 @@ depends="hicolor-icon-theme"
 short_desc="KDE screen management software"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/kscreen"
+homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=39bcbbaa1e0387a57adfc7b49ba807a2920a602c100b6aaefe3974883ca46b54
+checksum=d6d67df60fe525588dabfc581b0818eb14b4848261b92007d5cb12d182a435e5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From e6e3fd864c9cbabdb67e19b3a88f28c13daa01c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:53:13 +0200
Subject: [PATCH 063/298] kscreenlocker: update to 5.19.4

[ci skip]
---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index e7e1b9ed3f2..66209f1e026 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fe06383dd6421ed053f84f80fd7ac7ea2cc8a325427d0369ac37b76f3a5036a8
+checksum=7db12fd3d0c18bd646c57c63c111cfd37200f44a3e0503ecfc5ba78cbf5559ba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From ac6e615e9dff3195097027ae181471c03fc36681 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:53:15 +0200
Subject: [PATCH 064/298] ksshaskpass: update to 5.19.4

[ci skip]
---
 srcpkgs/ksshaskpass/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 5f712ab94eb..99c8726ace2 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,6 +10,6 @@ makedepends="kwallet-devel kdoctools-devel"
 short_desc="KDE ssh-add helper"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/ksshaskpass"
+homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=399ce76b95bc51566bf34612ca787ce0112681a6299a52c2cee388bf7749f77b
+checksum=f481f5c6c7be9d3a8fe7d90dd345969e2bd6c58adda32898f51932536e722d80

From a8344cd99cb41b0399c8cfde191652a3cd9ef624 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:53:18 +0200
Subject: [PATCH 065/298] ksysguard: update to 5.19.4

[ci skip]
---
 srcpkgs/ksysguard/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index c4000839727..d07588db1e9 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,6 +11,6 @@ depends="hicolor-icon-theme lm_sensors"
 short_desc="KDE program to monitor various elements of your system"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
-homepage="https://projects.kde.org/projects/plasma/ksysguard"
+homepage="https://invent.kde.org/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2f46c3b5aa22f2c676e6e1bf48a68326fc3febe8cdcc1a2083a7324e4ab00ede
+checksum=1f49c29f361c7831ac540bf267855563633f9b7ad4c3b7ec0d6f600af81e5179

From 49aefd569fd7e7d83ab6b6aca74801a6b63aff3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:53:20 +0200
Subject: [PATCH 066/298] kwallet-pam: update to 5.19.4

[ci skip]
---
 srcpkgs/kwallet-pam/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 7b1e6f76046..8f204e793fe 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -9,6 +9,6 @@ depends="socat pam"
 short_desc="KWallet PAM integration"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/kwallet-pam"
+homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=76c8c5f4de02bb33ea3c9766c0cbb04a17b85a668d21c44cebdf594ce03dcc11
+checksum=c5ea6cd59fd4a6e618f6af6503210682aa35ad45bdf3dea586c5d3f855ab6e39

From ece519fd780f9a3d71e4f195d478e94f253e0dde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:53:22 +0200
Subject: [PATCH 067/298] kwayland-integration: update to 5.19.4

[ci skip]
---
 srcpkgs/kwayland-integration/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 9c4399b545e..9d62101aae4 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,6 +9,6 @@ makedepends="kidletime-devel kwayland-devel kwindowsystem-devel kguiaddons-devel
 short_desc="Integration plugins for Kwayland"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/kwayland-integration"
+homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=661a412bc9a37018ec30843b36af25c49816449a681e707a8c3dad0cbf531679
+checksum=aba501cf82d2ca5247fe1f3aa93ab40df6daf549cd3a1f001dd81f355901f37b

From 3f6e856b771f228ed801e197d7d7190a136be2bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:02 +0200
Subject: [PATCH 068/298] kwayland-server: update to 5.19.4

[ci skip]
---
 srcpkgs/kwayland-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 1605193d792..764ece378bf 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -10,9 +10,9 @@ makedepends="kwayland-devel wayland-protocols"
 short_desc="Wayland server components built on KDE Frameworks"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
-homepage="https://cgit.kde.org/kwayland-server.git"
+homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9ed98177d81170e08083149f8ddf0a84b4906a751963d142120c846d01ec52ed
+checksum=4ce543b227a931cae04d6f636ad4de9775035d8d3b51a8de96851415686504ad
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From bd6b5672f79dc08a14c5116a580302010e45ead9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:05 +0200
Subject: [PATCH 069/298] kwin: update to 5.19.4

[ci skip]
---
 srcpkgs/kwin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index ccedd53524e..1c4be59b4e3 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,9 +14,9 @@ depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.0<5.15.1"
 short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/kwin"
+homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=955e889f6f25a777d1063480c67782788a3665c432e338d37ea7c61cdc02a34a
+checksum=456205b964efadadc6df8e5f3db40da3719bec567cf93f2719b015561a57672e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kcoreaddons kconfig"

From 7aa1ab9ff28e3b95b9ad40df8098799a8d572b44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:08 +0200
Subject: [PATCH 070/298] kwrited: update to 5.19.4

[ci skip]
---
 srcpkgs/kwrited/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 3231f9d5486..436cb97a048 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,6 +9,6 @@ makedepends="kdbusaddons-devel knotifications-devel kpty-devel kdoctools"
 short_desc="KDE daemon listening for wall and write messages"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/kwrited"
+homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=66fa2caacd85875a6c246a0b3bd05e596b483c867b9bb31cdebbf902d7bf0158
+checksum=3f64acb63ce009c849ca3a49288795e20a894afc6fc77a0e2480ab294cce8272

From 36b3b392d85d5460ba1b6a915ce1c0db06bf2f6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:10 +0200
Subject: [PATCH 071/298] libkscreen: update to 5.19.4

[ci skip]
---
 srcpkgs/libkscreen/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 65471540e19..5065d4385ec 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,9 +9,9 @@ makedepends="qt5-tools-devel qt5-x11extras-devel libXrandr-devel kwayland-devel"
 short_desc="KDE screen management software"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/extragear/libs/libkscreen"
+homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=67b635062bb4a056cbcd8b5075fa6b4c4b2bd6621eaeb9345228419f402b10c6
+checksum=7140ff923c42cfcffbe4b1b2b15df20736342889c7f29b1d847db353e46c8281
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From f6204eb1d140f94a7674afc059d48bc5bb016601 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:12 +0200
Subject: [PATCH 072/298] libksysguard: update to 5.19.4

[ci skip]
---
 srcpkgs/libksysguard/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 9fb34210619..abfb53eef17 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -9,9 +9,9 @@ makedepends="plasma-framework-devel qt5-webchannel-devel knewstuff-devel
 short_desc="KDE libksysguard"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/libksysguard"
+homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9546c4264d47c5d9ffdf12bb4075218e43995c194ec8b43bb423acd535cf1938
+checksum=576ec7c114c337fb5e888ba3ebb46d0cea4c4164e7fc8c0bdead59655d901c37
 
 build_options="webengine"
 

From fa52218ea8cc403a34d85aa21a8a7a0d97514176 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:15 +0200
Subject: [PATCH 073/298] milou: update to 5.19.4

[ci skip]
---
 srcpkgs/milou/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index e1e6e36d0eb..864286d7381 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,9 +10,9 @@ makedepends="krunner-devel kitemmodels-devel"
 short_desc="KDE dedicated search application built on top of Baloo"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/milou"
+homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8ec48ee51f0a1e1db8f40dc166d4c9475487f9e5a7acb9eea076169f0a3847a5
+checksum=4e8dced6032457f7f9c24a5730fe84be171f0cd43fa5c90a9c6a1127286dfb5c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From d3aa62ccae538e83c45745d11365e2520db2228c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:18 +0200
Subject: [PATCH 074/298] oxygen: update to 5.19.4

[ci skip]
---
 srcpkgs/oxygen/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index d1a0c8b7f78..a0d28068891 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,6 +11,6 @@ makedepends="kdecoration-devel frameworkintegration-devel kwayland-devel
 short_desc="Oxygen visual style for the Plasma Desktop"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/oxygen"
+homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f9b69c129c07b7e08f5e830b3ac6de028251a8699b8e2172b59dd13a0115f98f
+checksum=f2f164e651af56610d870f9c92ad22922e0d74fd51e8b30daf568e6d97ea226d

From 3e2e4a49c20121b9cdffef67603d4ecf1f31d2bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:20 +0200
Subject: [PATCH 075/298] plasma-browser-integration: update to 5.19.4

[ci skip]
---
 srcpkgs/plasma-browser-integration/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 57e59fe556f..6c21eb42da6 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,9 +11,9 @@ makedepends="qt5-devel kio-devel ki18n-devel krunner-devel kactivities5-devel
 short_desc="Integration of web browsers with the KDE Plasma 5 desktop"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/plasma-browser-integration"
+homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9f2989d25b3e49a2965872e46528dbbe931a7d67f6535a42256d3d5ea0b2f29e
+checksum=a947307b6e8095007e7488e9f5c3d87afdeb538c88a1b6f194bc99533098a5a5
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 15c0fe47db7eaad62822de5e4a9147fc7eed355d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:25 +0200
Subject: [PATCH 076/298] plasma-desktop: update to 5.19.4

[ci skip]
---
 srcpkgs/plasma-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 9e70a051ad7..5e8ae24fbc3 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,9 +13,9 @@ depends="kmenuedit ksysguard polkit-kde-agent powerdevil systemsettings"
 short_desc="KDE Plasma Desktop"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
-homepage="https://projects.kde.org/projects/plasma/plasma-desktop"
+homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1c61bc3c971db3e0125f4f7961156121610f0602bd75e3ff16d4dee67232a8ba
+checksum=54321901c3d32b7699fb60d67e8630c17e38523d73a18e1feba51c98dd77de87
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig-devel kcoreaddons-devel kded

From 9ed933577a38ae5e9986fd28497a5621ed353b77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:28 +0200
Subject: [PATCH 077/298] plasma-integration: update to 5.19.4

[ci skip]
---
 srcpkgs/plasma-integration/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 71242e0a3cb..6d7287a1fc6 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,6 +12,6 @@ depends="noto-fonts-ttf font-hack-ttf breeze qqc2-desktop-style"
 short_desc="Theme integration plugins for the Plasma workspaces"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/plasma-integration"
+homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fc268d944ad4b7bac281d471554849a4a94b3595443c2e29b58c28b05f49091
+checksum=d6d37aa3a8bde4c435d6836c5421c73d68a6e19519b44bfd5bf2bce4516e1536

From 269ed1d2c8ac0140e3c0a985a72a00e3800c44d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:30 +0200
Subject: [PATCH 078/298] plasma-nm: update to 5.19.4

[ci skip]
---
 srcpkgs/plasma-nm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index db28204e892..ba628bd81f2 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,9 +13,9 @@ depends="mobile-broadband-provider-info"
 short_desc="NetworkManager Plasma applet"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/plasma-nm"
+homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cf15bfeb4e90156fe6c374caad6c4b4fd9d87c29a812d2163f715124f52e765c
+checksum=df4a0ab64eb5e5cbc0a4ebf9c70106ec2cadbd1893b896c15c3561b78893342c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 03f81b89a66d74045c965ebd4752b9b3ac8b988b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:33 +0200
Subject: [PATCH 079/298] plasma-pa: update to 5.19.4

[ci skip]
---
 srcpkgs/plasma-pa/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 54bbb975a4b..1203040fa65 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,9 +11,9 @@ makedepends="plasma-framework-devel kdoctools-devel pulseaudio-devel
 short_desc="PulseAudio Plasma applet"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/plasma-pa"
+homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8cf420b64f2deb11c869367bc5362730ddc5bc3bffc52e47d511b0d86349ef2b
+checksum=a9ec0a3bc36de5d41e37b53078b8f7c12e5c075aca9e5c1a64b11c063617c831
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 8e060165cd35bde6d137f537ab364b2d682e1662 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:54:35 +0200
Subject: [PATCH 080/298] plasma-sdk: update to 5.19.4

[ci skip]
---
 srcpkgs/plasma-sdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index fe3a66f4993..64e8721835c 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,9 +11,9 @@ makedepends="plasma-framework-devel kdelibs4support-devel kdesignerplugin-devel
 short_desc="Plasma development applications"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/plasma-sdk"
+homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64e91c561256e4edb99ac49c980a758bcadf8a4b87f9cac1f8aa5ab3f7bc0492
+checksum=865bc63240989a853840629467c19aa77acec27396ac2280c909b59e72ebcb3d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 683d2a297dd6a1177d8609126f0cc9415086ef8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:55:19 +0200
Subject: [PATCH 081/298] plasma-thunderbolt: update to 5.19.4

[ci skip]
---
 srcpkgs/plasma-thunderbolt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index cf343de9338..f7ce03b012d 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -10,9 +10,9 @@ depends="bolt"
 short_desc="Plasma integration for controlling Thunderbolt devices"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
-homepage="https://cgit.kde.org/plasma-thunderbolt.git"
+homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a06ede08535d238a353f9f75dffb73808c72342edf39466ce8ff6b53ea4f7ebe
+checksum=4d539036ad7028e2709a2fe408cf51f75f3fc9a9423c49a47c6e75aecc302f3d
 
 do_check() {
 	: # Requires running dbus and bolt services

From b086e747fa39d07fe0eaecc2eb65094e7d6c1867 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:55:21 +0200
Subject: [PATCH 082/298] plasma-vault: update to 5.19.4

[ci skip]
---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index 1042d09882f..37864bb4d66 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cce3d18d1ec7c7aea3f7b77346122aab45b18b91c21aa69f4a2d45913f80b04a
+checksum=38e55a6a52afc774ecf28a31895f32b542d70fd33050c246af25908791a93654
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From a983b285ef8acf91743cfa88010cdc57a75e4e55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:55:30 +0200
Subject: [PATCH 083/298] plasma-workspace-wallpapers: update to 5.19.4

[ci skip]
---
 srcpkgs/plasma-workspace-wallpapers/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 2d37d430071..03f0cd0aff8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.19.3
+version=5.19.4
 revision=1
 archs=noarch
 build_style=cmake
@@ -9,6 +9,6 @@ hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
 short_desc="KDE Plasma wallpapers"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/plasma-workspace-wallpapers"
+homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=971f5638818e57cdf74835e5a72615b86b21069105d3dc09ff526a9a4b04f693
+checksum=4cec20329847e655649ad41bfc290815cc97d494de385b40f679694d9db3f23e

From b1f578c723566df435d1cce01c33febcf38f9a26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:55:33 +0200
Subject: [PATCH 084/298] plasma-workspace: update to 5.19.4

[ci skip]
---
 srcpkgs/plasma-workspace/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9051b166ed4..d0d9708f7c5 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -17,9 +17,9 @@ depends="kactivitymanagerd kwin iso-codes milou plasma-integration
 short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
-homepage="https://projects.kde.org/projects/plasma/plasma-workspace"
+homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a967b4b3679f17b6e01b4811015ef6210f0f73bb035642867415c51c1ed20894
+checksum=584fada178f8a3d770080e1faa631cb64eebbf70af89f5d611ac9438fa868bd3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 0a3843299a2b48da26981cb73ec75a607f39ed27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:55:35 +0200
Subject: [PATCH 085/298] polkit-kde-agent: update to 5.19.4

[ci skip]
---
 srcpkgs/polkit-kde-agent/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index eedcb46f78a..c4a0253b61b 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.19.3
+version=5.19.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -11,6 +11,6 @@ makedepends="kcrash-devel kdbusaddons-devel kiconthemes-devel kdoctools-devel"
 short_desc="KDE PolKit auth agent"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/polkit-kde-agent"
+homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=fa24b804d740641fd8cd325a6184a99b1cdb2f2bdc6d2c6439d24edb60c8835f
+checksum=97247680c46cf625e186125fa0683244137dfe08ab77ffa9691ca17c70aaa21a

From bed55523816bcb7024feddc76f37795c32f1afa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:55:37 +0200
Subject: [PATCH 086/298] powerdevil: update to 5.19.4

[ci skip]
---
 srcpkgs/powerdevil/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3863bac402..2a70681ccc1 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,6 +11,6 @@ makedepends="bluez-qt5-devel libkscreen-devel networkmanager-qt5-devel
 short_desc="Power consumption settings of a Plasma"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/powerdevil"
+homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f70032b2e0763d7e05fdc0a83711ab5d2802f925da156568afc208c75034ac0e
+checksum=20c66e0b47474a29e6c54a9cc9c1aac88e469c7aefe196ab954fd7959ba5306f

From e9007d4bfa0364c04a7e81e07223b386c20d2e89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:55:40 +0200
Subject: [PATCH 087/298] sddm-kcm: update to 5.19.4

[ci skip]
---
 srcpkgs/sddm-kcm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index bd9af80bd2f..6f647eb1130 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,6 +12,6 @@ depends="sddm"
 short_desc="KDE Config Module for SDDM"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/sddm-kcm"
+homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=36127218130b07145db2a7c8931132c6ec793bb027a849c5046e6ec670ab1485
+checksum=97aa227996995ebdcc9b6dd4dc327393f91962dd9a25cda690c83db2c303339a

From 91060f99ca5d547aecde896bd6ea9359c26bd577 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:55:43 +0200
Subject: [PATCH 088/298] systemsettings: update to 5.19.4

[ci skip]
---
 srcpkgs/systemsettings/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3ea68901d64..9f4121a60c4 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,9 +11,9 @@ depends="kirigami2 setxkbmap xrdb"
 short_desc="KDE System settings"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
-homepage="https://projects.kde.org/projects/plasma/systemsettings"
+homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=32d09d536f02a3e01b1250aff52612952470a051a49242a00874da0b20c0b33f
+checksum=a84544d7d7f3d247a81e49046595e42acf3d25b22b9875ff66cdb0bb3f218ebe
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python qt5-qmake qt5-host-tools kconfig

From 7e989bfead3cb65a18b988e30d94fa45d97105a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:55:46 +0200
Subject: [PATCH 089/298] user-manager: update to 5.19.4

[ci skip]
---
 srcpkgs/user-manager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/user-manager/template b/srcpkgs/user-manager/template
index 6c3ce5e4fa1..acd147e2a57 100644
--- a/srcpkgs/user-manager/template
+++ b/srcpkgs/user-manager/template
@@ -1,6 +1,6 @@
 # Template file for 'user-manager'
 pkgname=user-manager
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,6 +12,6 @@ depends="accountsservice"
 short_desc="KDE user manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
-homepage="https://projects.kde.org/projects/plasma/user-manager"
+homepage="https://invent.kde.org/plasma/user-manager"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7e0ac9b696941ce394bc88e68c1fc09ce30e044940c2ff421cc95fa2592091ac
+checksum=40e858e683c481e49cc087a69d8fa4fde4f79b2cdd61bddeac9a02fb5795f45e

From 1ee75a116a0413cd2f481ac161c82e76b3caf5f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 28 Jul 2020 16:55:49 +0200
Subject: [PATCH 090/298] xdg-desktop-portal-kde: update to 5.19.4

[ci skip]
---
 srcpkgs/xdg-desktop-portal-kde/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 101800ebb26..4b634962234 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.19.3
+version=5.19.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons gettext
@@ -10,6 +10,6 @@ makedepends="glib-devel kio-devel kwayland-devel libepoxy-devel pipewire-devel
 short_desc="Backend implementation for xdg-desktop-portal that is using Qt/KF5"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
-homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde"
+homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da2ca69694230d560066b63fe3a4eec280fdc2981b521eb794acf4b629b3a013
+checksum=8dce3b66f5ec26a13608521d5c20a9619eaa8e8f26911b90727a81cf6adbc13f

From eeb9919807213727b29325b0f29c051c56cb3aaa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jul 2020 12:57:28 -0400
Subject: [PATCH 091/298] ldc: update to 1.22.0.

---
 common/shlibs        | 10 +++++-----
 srcpkgs/ldc/template |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f249f2b8f72..fc85c709876 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2144,11 +2144,11 @@ libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1
 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1
 liblastfm.so.1 liblastfm-1.0.9_1
 liblastfm_fingerprint.so.1 liblastfm-1.0.9_1
-libdruntime-ldc-debug-shared.so.91 ldc-runtime-1.21.0_1
-libdruntime-ldc-shared.so.91 ldc-runtime-1.21.0_1
-libphobos2-ldc-shared.so.91 ldc-runtime-1.21.0_1
-libphobos2-ldc-debug-shared.so.91 ldc-runtime-1.21.0_1
-libldc-jit.so.91 ldc-runtime-1.21.0_1
+libdruntime-ldc-debug-shared.so.92 ldc-runtime-1.22.0_1
+libdruntime-ldc-shared.so.92 ldc-runtime-1.22.0_1
+libphobos2-ldc-shared.so.92 ldc-runtime-1.22.0_1
+libphobos2-ldc-debug-shared.so.92 ldc-runtime-1.22.0_1
+libldc-jit.so.92 ldc-runtime-1.22.0_1
 libmarblewidget-qt5.so.28 marble5-17.12.2_1
 libastro.so.2 marble5-17.12.2_1
 libparrot.so.6.9.0 parrot-6.9.0_1
diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template
index 6d6a16ee20d..61e9cf854fc 100644
--- a/srcpkgs/ldc/template
+++ b/srcpkgs/ldc/template
@@ -1,7 +1,7 @@
 # Template file for 'ldc'
 pkgname=ldc
-version=1.21.0
-revision=2
+version=1.22.0
+revision=1
 wrksrc="ldc-${version}-src"
 build_style=cmake
 configure_args="
@@ -19,9 +19,9 @@ license="BSD-3-Clause, BSL-1.0"
 homepage="https://wiki.dlang.org/LDC"
 changelog="https://raw.githubusercontent.com/ldc-developers/ldc/master/CHANGELOG.md"
 distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"
-checksum=50b7f929bf6b285c5b6618dd32162838daa2788298f25e669570df3fdc0716d8
+checksum=866becac61fb225b0d55847fb5f206ff042d6a3ff63b671a474aa8b6a93d8988
 nopie=yes
-nocross=yes
+nocross="dmd compilation fails on cross"
 
 post_install() {
 	vlicense LICENSE

From fae49b492876014d45f479b915c2ec8f35f806e5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jul 2020 12:53:58 -0400
Subject: [PATCH 092/298] gtkd: revbump for ldc

---
 srcpkgs/gtkd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template
index 9955e3fc74a..e2de5cdc1fb 100644
--- a/srcpkgs/gtkd/template
+++ b/srcpkgs/gtkd/template
@@ -1,7 +1,7 @@
 # Template file for 'gtkd'
 pkgname=gtkd
 version=3.9.0
-revision=2
+revision=3
 wrksrc="GtkD-${version}"
 build_style=gnu-makefile
 make_build_args="LDFLAGS='-linker=bfd' DC=ldc2"

From 7f4c0e09d7ba02ab1ffdf8267bc1c79e3c0b3541 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jul 2020 12:53:58 -0400
Subject: [PATCH 093/298] tilix: revbump for ldc

---
 srcpkgs/tilix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template
index aa8d807d68a..26f9f0ea2dc 100644
--- a/srcpkgs/tilix/template
+++ b/srcpkgs/tilix/template
@@ -1,7 +1,7 @@
 # Template file for 'tilix'
 pkgname=tilix
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config
  librsvg tar"

From 3d287cca14fd031a6874d8be995830e9a37c8b3a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jul 2020 12:53:58 -0400
Subject: [PATCH 094/298] onedrive: revbump for ldc

---
 srcpkgs/onedrive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template
index 85923b540c3..693c43b3282 100644
--- a/srcpkgs/onedrive/template
+++ b/srcpkgs/onedrive/template
@@ -1,7 +1,7 @@
 # Template file for 'onedrive'
 pkgname=onedrive
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="DC=ldc2"
 hostmakedepends="ldc pkg-config"

From 79c0ecd754554305803475b3ee1d5ccdfa177970 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 095/298] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..44c650c67dd
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="~i686" # aggresive cpu detection
+build_style=cargo
+hostmakedepends="m4 pkg-config"
+depends="gmp"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From cfd7261e302681a5db9b9032464c1db351f87d65 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 28 Jul 2020 21:45:15 +0300
Subject: [PATCH 096/298] pycharm-community: update to 2020.1.4.

---
 srcpkgs/pycharm-community/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pycharm-community/template b/srcpkgs/pycharm-community/template
index a1f4c76259a..aebfef76560 100644
--- a/srcpkgs/pycharm-community/template
+++ b/srcpkgs/pycharm-community/template
@@ -1,6 +1,6 @@
 # Template file for 'pycharm-community'
 pkgname=pycharm-community
-version=2020.1.1
+version=2020.1.4
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment giflib libXtst"
@@ -9,7 +9,7 @@ maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/pycharm/"
 distfiles="https://download-cf.jetbrains.com/python/${pkgname}-${version}.tar.gz"
-checksum=715a6a1fc1638078a36b5b45e36e3dbe1ce097aa974555023b4b3d957d00585c
+checksum=d0c2d7995937b744e58b5fb3e49f5361ea7734470c841330e870d0fb13ea03e4
 repository=nonfree
 nopie=yes
 python_version=3

From 07b67914a413d0788d52f3f7535284b5e9225893 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 29 Jul 2020 00:34:06 +0200
Subject: [PATCH 097/298] scryer-prolog: mark broken on musl

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 44c650c67dd..d1a4a585ef7 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# XXX: Also should have GMP_MPFR_SYS_CACHE="" set somewhere https://crates.io/crates/gmp-mpfr-sys (we have ccache for that)
+	# We might also want to use system libs instead
+	# the runtime dep on gmp is incorrect right now, since gmp is statically linked
+	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/29779/steps/shell_3/logs/stdio"
+fi
+
 post_install() {
 	vlicense LICENSE
 }

From 790b3b9a2ac7326060357a104acb21a97f8760ed Mon Sep 17 00:00:00 2001
From: Nicu Borta <nicuborta123@tutanota.com>
Date: Thu, 23 Jul 2020 12:33:32 +0300
Subject: [PATCH 098/298] mesa: Update to 20.1.4

---
 srcpkgs/mesa/patches/add-use-elf-tls.patch    | 10 +++----
 srcpkgs/mesa/patches/clover-ppc64-cpp14.patch | 13 --------
 .../mesa/patches/fix-libXvMC-versioning.patch | 15 ----------
 srcpkgs/mesa/patches/parallel-build.patch     | 30 -------------------
 srcpkgs/mesa/template                         |  6 ++--
 5 files changed, 8 insertions(+), 66 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/clover-ppc64-cpp14.patch
 delete mode 100644 srcpkgs/mesa/patches/fix-libXvMC-versioning.patch
 delete mode 100644 srcpkgs/mesa/patches/parallel-build.patch

diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-use-elf-tls.patch
index 08d15e6a2cf..d5b933d586d 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-use-elf-tls.patch
@@ -2,19 +2,19 @@ Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
 Status: Not fixed upstream
 
 diff --git meson.build meson.build
-index 4afd8ca..ab9b365 100644
+index d228de0..972cd79 100644
 --- meson.build
 +++ meson.build
-@@ -387,7 +387,8 @@
+@@ -392,7 +392,8 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
  endif
  
  # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
--if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+-if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
 +with_use_elf_tls = get_option('use-elf-tls')
-+if host_machine.system() != 'windows' and with_use_elf_tls and (not with_platform_android or get_option('platform-sdk-version') >= 29)
++if not ['windows', 'freebsd'].contains(host_machine.system()) and with_use_elf_tls and (not with_platform_android or get_option('platform-sdk-version') >= 29)
    pre_args += '-DUSE_ELF_TLS'
  endif
- 
+
 diff --git meson_options.txt meson_options.txt
 index b768c15..2533220 100644
 --- meson_options.txt
diff --git a/srcpkgs/mesa/patches/clover-ppc64-cpp14.patch b/srcpkgs/mesa/patches/clover-ppc64-cpp14.patch
deleted file mode 100644
index b7eef76959a..00000000000
--- a/srcpkgs/mesa/patches/clover-ppc64-cpp14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-LLVM10 headers need C++14, so override the override.
-
---- meson.build
-+++ meson.build
-@@ -730,7 +730,7 @@ if _opencl != 'disabled'
-       #error "AltiVec not enabled"
-       #endif''',
-       name : 'Altivec')
--    clover_cpp_std += ['cpp_std=gnu++11']
-+    clover_cpp_std += ['cpp_std=gnu++14']
-   endif
- else
-   dep_clc = null_dep
diff --git a/srcpkgs/mesa/patches/fix-libXvMC-versioning.patch b/srcpkgs/mesa/patches/fix-libXvMC-versioning.patch
deleted file mode 100644
index b2f507bc76e..00000000000
--- a/srcpkgs/mesa/patches/fix-libXvMC-versioning.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: maxice8
-Upstream: no
-Reason: restores versioning of libXvMC drivers that was on autotools
-
---- src/gallium/targets/xvmc/meson.build
-+++ src/gallium/targets/xvmc/meson.build
-@@ -51,7 +51,7 @@ libxvmc_gallium = shared_library(
- 
- foreach d : [[with_gallium_r600, 'r600'], [with_gallium_nouveau, 'nouveau']]
-   if d[0]
--    xvmc_drivers += 'libXvMC@0@.so'.format(d[1])
-+    xvmc_drivers += 'libXvMC@0@.so.1.0.0'.format(d[1])
-   endif
- endforeach
- 
diff --git a/srcpkgs/mesa/patches/parallel-build.patch b/srcpkgs/mesa/patches/parallel-build.patch
deleted file mode 100644
index 4defe50906e..00000000000
--- a/srcpkgs/mesa/patches/parallel-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 158c45a9a2555afca5adcfcebfa8e2dd3ff75507 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 7 Mar 2020 05:00:24 +0100
-Subject: [PATCH] depend on sha1_h in src/vulkan/overlay-layer
-
-Without this, the dependency ordering gets messed up and during
-highly parallel builds the git_sha1.h file gets generated later
-than overlay-layer is compiled. That results in build errors like:
-
-overlay.cpp:31:10: fatal error: git_sha1.h: No such file or directory
----
- src/vulkan/overlay-layer/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/vulkan/overlay-layer/meson.build src/vulkan/overlay-layer/meson.build
-index 5b553d0..51e053e 100644
---- src/vulkan/overlay-layer/meson.build
-+++ src/vulkan/overlay-layer/meson.build
-@@ -38,7 +38,7 @@ vklayer_files = files(
- 
- vklayer_mesa_overlay = shared_library(
-   'VkLayer_MESA_overlay',
--  vklayer_files, overlay_spv,
-+  [vklayer_files, sha1_h], overlay_spv,
-   c_args : [c_vis_args, no_override_init_args, vulkan_wsi_args],
-   cpp_args : [cpp_vis_args, vulkan_wsi_args],
-   dependencies : [idep_vulkan_util, idep_mesautil, vulkan_wsi_deps, libimgui_core_dep, dep_dl],
--- 
-2.25.1
-
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 21218e86f3c..7bfb661a15b 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=20.1.2
+version=20.1.4
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -21,9 +21,9 @@ short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
-changelog="https://www.mesa3d.org/relnotes/${version}.html"
+changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=283dff72814c8a80ce1ff8271e3f055895d26f4da3f4362acc49193e635780cb
+checksum=6800271c2be2a0447510eb4e9b67edd9521859a4d565310617c4b359eb6799fe
 
 build_options="wayland"
 build_options_default="wayland"

From b31aa92ef163ab488b4dda1438393fb5710cf3a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jul 2020 21:29:28 -0400
Subject: [PATCH 099/298] fswebcam: update to 20200725.

Closes #23923
---
 srcpkgs/fswebcam/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/fswebcam/template b/srcpkgs/fswebcam/template
index 81689aa760b..024dd2e4f55 100644
--- a/srcpkgs/fswebcam/template
+++ b/srcpkgs/fswebcam/template
@@ -1,12 +1,12 @@
 # Template file for 'fswebcam'
 pkgname=fswebcam
-version=20140113
-revision=2
+version=20200725
+revision=1
 build_style=gnu-configure
 makedepends="gd-devel"
-short_desc="A neat and simple webcam app"
+short_desc="Neat and simple webcam app"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-only"
-homepage="http://www.firestorm.cx/fswebcam/"
-distfiles="http://www.firestorm.cx/fswebcam/files/fswebcam-${version}.tar.gz"
-checksum=3ee389f72a7737700d22e0c954720b1e3bbadc8a0daad6426c25489ba9dc3199
+homepage="http://www.sanslogic.co.uk/fswebcam/"
+distfiles="https://github.com/fsphil/fswebcam/archive/${version}.tar.gz"
+checksum=d5439b2bf49bb634100d7e42ed9854f84bfd355c1d40bc3d4d81593eeadd8aee

From 4378c0d8d7cfe2c48781d82084b4fa4d6b08b90d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Mon, 27 Jul 2020 22:53:16 -0700
Subject: [PATCH 100/298] New package: shinit-0.1.2

---
 srcpkgs/shinit/files/shinit/run | 11 +++++++++++
 srcpkgs/shinit/template         | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/shinit/files/shinit/run
 create mode 100644 srcpkgs/shinit/template

diff --git a/srcpkgs/shinit/files/shinit/run b/srcpkgs/shinit/files/shinit/run
new file mode 100644
index 00000000000..f51d6a9e2ca
--- /dev/null
+++ b/srcpkgs/shinit/files/shinit/run
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+export SHINIT_USER=void
+
+[ -r ./conf ] && . ./conf
+
+shinit
+
+# This is a strange thing to do, but this service should generally
+# speaking only ever run once in the life of a machine.
+rm -f /var/service/shinit
diff --git a/srcpkgs/shinit/template b/srcpkgs/shinit/template
new file mode 100644
index 00000000000..893361cd38b
--- /dev/null
+++ b/srcpkgs/shinit/template
@@ -0,0 +1,20 @@
+# Template file for 'shinit'
+pkgname=shinit
+version=0.1.2
+revision=1
+depends="curl"
+make_dirs="/var/lib/shinit 0755 root root"
+short_desc="Minimalist approach to cloud-init style provisioning"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MIT"
+homepage="https://github.com/the-maldridge/shinit/"
+distfiles="https://github.com/the-maldridge/shinit/archive/v$version.tar.gz"
+checksum=04bb0f154acbc11a7271d53569bcb89c598e9e28cdca39c61e281dd38f88f482
+
+do_install() {
+	vlicense LICENSE.md
+	vbin shinit
+	vmkdir usr/libexec/shinit
+	vcopy libexec/* usr/libexec/shinit
+	vsv shinit
+}

From 7c99afd3f2cd948f581fa07c021ce46eb17144ff Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 28 Jul 2020 22:02:59 +0300
Subject: [PATCH 101/298] grml-zsh-config: update to 0.17.4.

---
 srcpkgs/grml-zsh-config/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grml-zsh-config/template b/srcpkgs/grml-zsh-config/template
index 38c4b5dbefa..1931c4d1f01 100644
--- a/srcpkgs/grml-zsh-config/template
+++ b/srcpkgs/grml-zsh-config/template
@@ -1,6 +1,6 @@
 # Template file for 'grml-zsh-config'
 pkgname=grml-zsh-config
-version=0.16.1
+version=0.17.4
 revision=1
 archs=noarch
 wrksrc="grml-etc-core-${version}"
@@ -9,7 +9,7 @@ maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
 license="GPL-2.0-only"
 homepage="https://grml.org/zsh/"
 distfiles="https://deb.grml.org/pool/main/g/grml-etc-core/grml-etc-core_${version}.tar.gz"
-checksum=98ea76c377ad73a76cdb4d2a582e4a7978d13695f57a5f335c064b1a87d9df6b
+checksum=680a8fe36ae49d6dbc25651b2b06c5ef143de92e355bd34b9b6f6e82bf842d7f
 
 do_install() {
 	vinstall etc/skel/.zshrc 0644 etc/skel

From 29122c938fe9bed74f9051da48917df823aefab7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jul 2020 11:45:04 +0200
Subject: [PATCH 102/298] stress-ng: update to 0.11.17.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 27228e9528a..1f8a0d050fc 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.11.16
+version=0.11.17
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=38accf36c4c30a51668fed8f5da4d8b097918046ee6567dc3f81b55039fd2454
+checksum=860291dd3a18b985b3483190a627bbede2b5c52113766c1921001b3fb4b83af0

From b3b09552dadc6631ed0776d41672eedfe1c03d22 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jul 2020 10:39:33 +0200
Subject: [PATCH 103/298] minify: update to 2.8.0.

---
 srcpkgs/minify/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 7472566340f..49981799bbe 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.7.7
+version=2.8.0
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify"
@@ -11,8 +11,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/${pkgname}/archive/v${version}.tar.gz"
-checksum=5f1dc505aceec11d3beffd3655eb11d9c7500076b8adb40f7b29a4288787b183
+checksum=4c833a23414d161059292232550238c054383e4a9558a2c4cd1ec6c96698b44c
 
 post_install() {
-	vlicense LICENSE.md LICENSE
+	vlicense LICENSE
 }

From 83b3adb68a3790a4e909a4fdd2a7730b97325eee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jul 2020 10:41:12 +0200
Subject: [PATCH 104/298] unbound: update to 1.11.0.

---
 srcpkgs/unbound/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 9a5e7d37a3d..813791dc9b2 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.10.1
-revision=2
+version=1.11.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://unbound.net/"
 distfiles="https://unbound.net/downloads/${pkgname}-${version}.tar.gz"
-checksum=b73677c21a71cf92f15cc8cfe76a3d875e40f65b6150081c39620b286582d536
+checksum=9f2f0798f76eb8f30feaeda7e442ceed479bc54db0e3ac19c052d68685e51ef7
 system_accounts="_unbound"
 
 post_install() {

From 2a6c0c52fea0e63474886dc390ac702e551289f4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jul 2020 11:29:06 +0200
Subject: [PATCH 105/298] linux5.7: update to 5.7.11.

---
 srcpkgs/linux5.7/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.7/template b/srcpkgs/linux5.7/template
index 7a250fb34c5..53070839f45 100644
--- a/srcpkgs/linux5.7/template
+++ b/srcpkgs/linux5.7/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.7'
 pkgname=linux5.7
-version=5.7.10
+version=5.7.11
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4725430c65b7573b7d26c402dd9ffdad18529a302ce2e342c849e7800f193d44
+checksum=93293032aa13c3998eeb2afd910f11c0f2e8a76ffec46f74ce3fcfac53ed60f1
 python_version=3
 patch_args="-Np1"
 

From af0fa1bb6154d35d8881893d49a174454c464ff5 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 14 Jun 2020 09:50:49 +0200
Subject: [PATCH 106/298] asciidoc: update to 9.0.2, use python3

---
 srcpkgs/asciidoc/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template
index b0b7817975b..5665577bacb 100644
--- a/srcpkgs/asciidoc/template
+++ b/srcpkgs/asciidoc/template
@@ -1,23 +1,20 @@
 # Template file for 'asciidoc'
 pkgname=asciidoc
-version=8.6.10
-revision=2
+version=9.0.2
+revision=1
 archs=noarch
+wrksrc=${pkgname}-py3-${version}
 build_style=gnu-configure
-hostmakedepends="automake docbook-xsl libxslt python"
-depends="docbook-xsl libxslt python"
+hostmakedepends="automake docbook-xsl libxslt python3"
+depends="docbook-xsl libxslt python3"
 conf_files="/etc/asciidoc/filters/*/*.conf /etc/asciidoc/*.conf"
 short_desc="Text based document generation"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://asciidoc.org/"
 license="GPL-2.0-or-later"
-distfiles="https://github.com/asciidoc/asciidoc/archive/${version}.tar.gz"
-checksum=9e52f8578d891beaef25730a92a6e723596ddbd07bfe0d2a56486fcf63a0b983
+homepage="https://asciidoc.org/"
+distfiles="https://github.com/asciidoc/asciidoc-py3/archive/${version}.tar.gz"
+checksum=ea73425151f56f278433e442f8b5085599765fa120574db65e6d053eb52927e2
 
 pre_configure() {
 	autoreconf -fi
 }
-
-post_install() {
-	vinstall vim/syntax/asciidoc.vim 644 usr/share/vim/vimfiles/syntax asciidoc.vim
-}

From 748567077b78f6c6bc5d1335cf74b13482e9d928 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 23 Jul 2020 12:35:25 +0200
Subject: [PATCH 107/298] util-linux-libs: update to 2.36.

---
 srcpkgs/util-linux-libs/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-libs/template
index 11a924cef5e..2f639a72e07 100644
--- a/srcpkgs/util-linux-libs/template
+++ b/srcpkgs/util-linux-libs/template
@@ -1,20 +1,22 @@
 # Template file for 'util-linux-libs'
 # Keep this package sync with util-linux
 pkgname=util-linux-libs
-version=2.35.2
+version=2.36
 revision=1
 wrksrc="util-linux-$version"
 build_style=meta
 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
-depends="libfdisk libblkid libmount libsmartcols libuuid"
+depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
+ libmount-${version}_${revision} libsmartcols-${version}_${revision}
+ libuuid-${version}_${revision}"
 checkdepends="ncurses" # Some tests require terminfo-entries
 short_desc="Miscellaneous linux utilities - meta libraries"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
-distfiles="${KERNEL_SITE}/utils/util-linux/v2.35/util-linux-${version}.tar.xz"
-checksum=21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a
+distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
+checksum=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
 
 pre_configure() {
 	local _cfgdir="$XBPS_COMMONDIR/environment/configure"

From 5c46d4081468d3c2158264363ea73020435c419e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 23 Jul 2020 12:32:51 +0200
Subject: [PATCH 108/298] util-linux: update to 2.36.

Close: #23760
---
 .../patches/cleanup-pidfd-includes.patch      | 44 -------------------
 srcpkgs/util-linux/template                   |  6 +--
 2 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch

diff --git a/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch b/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch
deleted file mode 100644
index 0285447d4ea..00000000000
--- a/srcpkgs/util-linux/patches/cleanup-pidfd-includes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-upstream: yes
-reason: fixes compilation for armv6-musl
-
-From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 10 Mar 2020 11:43:16 +0100
-Subject: include: cleanup pidfd inckudes
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- include/pidfd-utils.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-(limited to 'include/pidfd-utils.h')
-
-diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
-index 0baedd2c9..4a6c3a604 100644
---- include/pidfd-utils.h
-+++ include/pidfd-utils.h
-@@ -3,10 +3,10 @@
- 
- #if defined(__linux__)
- # include <sys/syscall.h>
--# if defined(SYS_pidfd_send_signal)
-+# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open)
- #  include <sys/types.h>
- 
--#  ifndef HAVE_PIDFD_OPEN
-+#  ifndef HAVE_PIDFD_SEND_SIGNAL
- static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
- 				    unsigned int flags)
- {
-@@ -14,7 +14,7 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
- }
- #  endif
- 
--#  ifndef HAVE_PIDFD_SEND_SIGNAL
-+#  ifndef HAVE_PIDFD_OPEN
- static inline int pidfd_open(pid_t pid, unsigned int flags)
- {
- 	return syscall(SYS_pidfd_open, pid, flags);
--- 
-cgit 1.2.3-1.el7
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index bb09d12d418..8a9a2e30415 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-libs
 pkgname=util-linux
-version=2.35.2
+version=2.36
 revision=1
 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
@@ -12,8 +12,8 @@ short_desc="Miscellaneous linux utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
-distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.35/${pkgname}-${version}.tar.xz"
-checksum=21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a
+distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
+checksum=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

From 867c7ac628c85d648d7ca4f036aba3e3056a5d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 28 Jul 2020 00:07:57 +0700
Subject: [PATCH 109/298] notmuch: update to 0.30.

Close #23874
---
 ...detect-version-by-compiler-for-build.patch |  51 +++++++++
 ...heck-for-pytest-with-python-m-pytest.patch |  37 ++++++
 ...rop-check-for-default-xapian-backend.patch | 108 ++++++++++++++++++
 ...55-specify-hash-algorithm-explicitly.patch |  39 +++++++
 ...ime-session-key-extraction-support-.patch} |  79 ++++---------
 ...mime-x509-certificate-validity-check.patch | 102 +++++++++++++++++
 ...-gmime-verify-with-session-key-check.patch | 101 ++++++++++++++++
 srcpkgs/notmuch/template                      |  62 +++++-----
 8 files changed, 498 insertions(+), 81 deletions(-)
 create mode 100644 srcpkgs/notmuch/patches/0001-configure-detect-version-by-compiler-for-build.patch
 create mode 100644 srcpkgs/notmuch/patches/0002-configure-check-for-pytest-with-python-m-pytest.patch
 create mode 100644 srcpkgs/notmuch/patches/0003-configure-drop-check-for-default-xapian-backend.patch
 create mode 100644 srcpkgs/notmuch/patches/0004-T355-specify-hash-algorithm-explicitly.patch
 rename srcpkgs/notmuch/patches/{cross.patch => 0005-configure-drop-gmime-session-key-extraction-support-.patch} (54%)
 create mode 100644 srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
 create mode 100644 srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch

diff --git a/srcpkgs/notmuch/patches/0001-configure-detect-version-by-compiler-for-build.patch b/srcpkgs/notmuch/patches/0001-configure-detect-version-by-compiler-for-build.patch
new file mode 100644
index 00000000000..ba540c7ab3f
--- /dev/null
+++ b/srcpkgs/notmuch/patches/0001-configure-detect-version-by-compiler-for-build.patch
@@ -0,0 +1,51 @@
+From 5402e4d357d7957942acc4b906b58102b6bd4fdf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 27 Jul 2020 15:46:35 +0700
+Subject: [PATCH] configure: detect version by compiler for build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We'll need to run the compiled binary to report our current version.
+
+With the same code base, we should have the same version information
+regardless of compiler and architecture.
+
+Let's use the compiler for building architecture to build the reporting
+binary. Which is usually reported under variable CC_FOR_BUILD,
+a convention established by GNU Autotools, and fall back to CC if it's
+not defined.
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ configure | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 80cbac4f..6c77960f 100755
+--- a/configure
++++ b/configure
+@@ -85,8 +85,10 @@ fi
+ BASHCMD=${BASHCMD:-bash}
+ PERL=${PERL:-perl}
+ CC=${CC:-cc}
++CC_FOR_BUILD=${CC_FOR_BUILD:-$CC}
+ CXX=${CXX:-c++}
+ CFLAGS=${CFLAGS:--g -O2}
++CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD:-$CFLAGS}
+ CPPFLAGS=${CPPFLAGS:-}
+ CXXFLAGS_for_sh=${CXXFLAGS:-${CFLAGS}}
+ CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
+@@ -409,7 +411,7 @@ int main(void) {
+     return 0;
+ }
+ EOF
+-if ${CC} ${CFLAGS} -I"$srcdir" _libversion.c -o _libversion > /dev/null 2>&1 \
++if ${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} -I"$srcdir" _libversion.c -o _libversion > /dev/null 2>&1 \
+        && ./_libversion > _libversion.sh && . ./_libversion.sh
+ then
+     printf "OK.\n"
+-- 
+2.28.0.rc2.21.g5c06d60fc5
+
diff --git a/srcpkgs/notmuch/patches/0002-configure-check-for-pytest-with-python-m-pytest.patch b/srcpkgs/notmuch/patches/0002-configure-check-for-pytest-with-python-m-pytest.patch
new file mode 100644
index 00000000000..c4ba22b0d41
--- /dev/null
+++ b/srcpkgs/notmuch/patches/0002-configure-check-for-pytest-with-python-m-pytest.patch
@@ -0,0 +1,37 @@
+From c5164d1c0f5ba108ace05146218bf3810d590d5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 27 Jul 2020 16:42:02 +0700
+Subject: [PATCH] configure: check for pytest with python -m pytest
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On different distro, pytest is suffixed with different patterns.
+
+On the other hand, `python3-pytest' could be invoked correctly,
+via `python3 -m pytest', the latter is used by our tests, now.
+
+Switch to `$python -m pytest` to fix address all incompatible naming.
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 6c77960f..459e0cae 100755
+--- a/configure
++++ b/configure
+@@ -811,7 +811,7 @@ if [ $have_python3 -eq 1 ]; then
+     printf "Checking for python3 pytest (>= 3.0)... "
+     conf=$(mktemp)
+     printf "[pytest]\nminversion=3.0\n" > $conf
+-    if pytest-3 -c $conf --version >/dev/null 2>&1; then
++    if "$python" -m pytest -c $conf --version >/dev/null 2>&1; then
+         printf "Yes.\n"
+         have_python3_pytest=1
+     else
+-- 
+2.28.0.rc2.21.g5c06d60fc5
+
diff --git a/srcpkgs/notmuch/patches/0003-configure-drop-check-for-default-xapian-backend.patch b/srcpkgs/notmuch/patches/0003-configure-drop-check-for-default-xapian-backend.patch
new file mode 100644
index 00000000000..3173d66d68a
--- /dev/null
+++ b/srcpkgs/notmuch/patches/0003-configure-drop-check-for-default-xapian-backend.patch
@@ -0,0 +1,108 @@
+From b7c8661b9a34d048120753fdf27cd288e34e5308 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 27 Jul 2020 20:11:00 +0700
+Subject: [PATCH] configure: drop check for default xapian backend
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting from xapian 1.3.5, xapian switched default backend to glass.
+
+From 00cdfe10 (build: drop support for xapian versions less than 1.4,
+2020-04-22), we only support xapian 1.4.0+. Effectively, we don't need
+to check for default xapian backend anymore.
+
+Let's drop it.
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ configure                  | 23 -----------------------
+ test/T360-symbol-hiding.sh |  4 ++--
+ test/test-lib.sh           | 11 +----------
+ 3 files changed, 3 insertions(+), 35 deletions(-)
+
+diff --git a/configure b/configure
+index 459e0cae..7dae745c 100755
+--- a/configure
++++ b/configure
+@@ -456,26 +456,6 @@ if [ ${have_xapian} = "0" ]; then
+     errors=$((errors + 1))
+ fi
+ 
+-if [ ${have_xapian} = "1" ]; then
+-    default_xapian_backend=""
+-    printf "Testing default Xapian backend... "
+-    cat >_default_backend.cc <<EOF
+-#include <xapian.h>
+-int main(int argc, char** argv) {
+-   Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+-}
+-EOF
+-    ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+-    ./_default_backend
+-    if [ -f test.db/iamglass ]; then
+-	default_xapian_backend=glass
+-    else
+-	default_xapian_backend=chert
+-    fi
+-    printf "%s\n" "${default_xapian_backend}";
+-    rm -rf test.db _default_backend _default_backend.cc
+-fi
+-
+ GMIME_MINVER=3.0.3
+ 
+ printf "Checking for GMime development files (>= $GMIME_MINVER)... "
+@@ -1507,9 +1487,6 @@ NOTMUCH_SRCDIR='${NOTMUCH_SRCDIR}'
+ # Whether to have Xapian retry lock
+ NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK=${WITH_RETRY_LOCK}
+ 
+-# Which backend will Xapian use by default?
+-NOTMUCH_DEFAULT_XAPIAN_BACKEND=${default_xapian_backend}
+-
+ # Whether GMime can verify X.509 certificate validity
+ NOTMUCH_GMIME_X509_CERT_VALIDITY=${gmime_x509_cert_validity}
+ 
+diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh
+index 43921cb4..eb438a7a 100755
+--- a/test/T360-symbol-hiding.sh
++++ b/test/T360-symbol-hiding.sh
+@@ -14,11 +14,11 @@ test_description='exception symbol hiding'
+ test_begin_subtest 'running test' run_test
+ mkdir -p ${PWD}/fakedb/.notmuch
+ $TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent 2>&1 \
+-	| notmuch_dir_sanitize | sed -e "s,\`,\',g" -e "s,${NOTMUCH_DEFAULT_XAPIAN_BACKEND},backend,g" > OUTPUT
++	| notmuch_dir_sanitize | sed -e "s,\`,\',g" > OUTPUT
+ 
+ cat <<EOF > EXPECTED
+ A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian'
+-caught No backend database found at path 'CWD/nonexistent'
++caught No glass database found at path 'CWD/nonexistent'
+ EOF
+ test_expect_equal_file EXPECTED OUTPUT
+ 
+diff --git a/test/test-lib.sh b/test/test-lib.sh
+index 7424881e..dc63ff1a 100644
+--- a/test/test-lib.sh
++++ b/test/test-lib.sh
+@@ -1255,16 +1255,7 @@ ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
+ rm -f y
+ 
+ # convert variable from configure to more convenient form
+-case "$NOTMUCH_DEFAULT_XAPIAN_BACKEND" in
+-    glass)
+-	db_ending=glass
+-    ;;
+-    chert)
+-	db_ending=DB
+-    ;;
+-    *)
+-	error "Unknown Xapian backend $NOTMUCH_DEFAULT_XAPIAN_BACKEND"
+-esac
++db_ending=glass
+ # declare prerequisites for external binaries used in tests
+ test_declare_external_prereq dtach
+ test_declare_external_prereq emacs
+-- 
+2.28.0.rc2.21.g5c06d60fc5
+
diff --git a/srcpkgs/notmuch/patches/0004-T355-specify-hash-algorithm-explicitly.patch b/srcpkgs/notmuch/patches/0004-T355-specify-hash-algorithm-explicitly.patch
new file mode 100644
index 00000000000..e68bd953fdc
--- /dev/null
+++ b/srcpkgs/notmuch/patches/0004-T355-specify-hash-algorithm-explicitly.patch
@@ -0,0 +1,39 @@
+From 808c43834e9e42be56f0fe1f61da5787784dc0e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 27 Jul 2020 22:05:46 +0700
+Subject: [PATCH] T355: specify hash algorithm explicitly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On some systems (notably, the one shipped with LibreSSL),
+default fingerprint digest algorithm is SHA256.
+
+On other systems, users can change default digest algorithm by changing
+default_md in /etc/ssl/default_md.
+
+Let's ask openssl to provide us specific algorithm to make the test
+more deterministic.
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ test/T355-smime.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/T355-smime.sh b/test/T355-smime.sh
+index f8cec62c..8b2b52be 100755
+--- a/test/T355-smime.sh
++++ b/test/T355-smime.sh
+@@ -6,7 +6,7 @@ test_description='S/MIME signature verification and decryption'
+ test_require_external_prereq openssl
+ test_require_external_prereq gpgsm
+ 
+-FINGERPRINT=$(openssl x509 -fingerprint -in "$NOTMUCH_SRCDIR/test/smime/key+cert.pem" -noout | sed -e 's/^.*=//' -e s/://g)
++FINGERPRINT=$(openssl x509 -sha1 -fingerprint -in "$NOTMUCH_SRCDIR/test/smime/key+cert.pem" -noout | sed -e 's/^.*=//' -e s/://g)
+ 
+ add_gpgsm_home
+ 
+-- 
+2.28.0.rc2.21.g5c06d60fc5
+
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
similarity index 54%
rename from srcpkgs/notmuch/patches/cross.patch
rename to srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
index 1ceaebafc56..581c6be1559 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
@@ -1,48 +1,29 @@
-From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
-From: Doan Tran Cong Danh <congdanhqx@gmail.com>
-Date: Mon, 10 Jun 2019 20:30:11 +0700
-Subject: [PATCH] configure: cross compile on Void Linux
+From 7589537f76541254d70d1b7df1ce57f0977ef9f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 27 Jul 2020 22:47:15 +0700
+Subject: [PATCH] configure: drop gmime session key extraction support check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-- Void Linux ships gmime linked against latest gpgme.
-- default Xapian backend is glass from version 1.4
-- cheat some test by running them on host environment
+Void Linux gmime3 always support session key extraction.
+
+No suitable for upstream.
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
 ---
- configure | 73 +++----------------------------------------------------
- 1 file changed, 4 insertions(+), 69 deletions(-)
+ configure | 58 -------------------------------------------------------
+ 1 file changed, 58 deletions(-)
 
 diff --git a/configure b/configure
-index 8b80f0e0..8e5fd4ce 100755
+index 7dae745c..99b0c328 100755
 --- a/configure
 +++ b/configure
-@@ -380,7 +380,7 @@ int main(void) {
-     return 0;
- }
- EOF
--if ${CC} ${CFLAGS} -I"$srcdir" _libversion.c -o _libversion > /dev/null 2>&1 \
-+if ${BUILD_CC} ${BUILD_CFLAGS} -I"$srcdir" _libversion.c -o _libversion > /dev/null 2>&1 \
-        && ./_libversion > _libversion.sh && . ./_libversion.sh
- then
-     printf "OK.\n"
-@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
-    Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
- }
- EOF
--    ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
--    ./_default_backend
--    if [ -f test.db/iamglass ]; then
--	default_xapian_backend=glass
--    else
--	default_xapian_backend=chert
--    fi
-+    default_xapian_backend=glass
-     printf "%s\n" "${default_xapian_backend}";
-     rm -rf test.db _default_backend _default_backend.cc
- fi
-@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
-     gmime_ldflags=$(pkg-config --libs gmime-3.0)
+@@ -467,65 +467,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
  
      printf "Checking for GMime session key extraction support... "
--
+ 
 -    cat > _check_session_keys.c <<EOF
 -#include <gmime/gmime.h>
 -#include <stdio.h>
@@ -56,11 +37,11 @@ index 8b80f0e0..8e5fd4ce 100755
 -
 -    g_mime_init ();
 -    parser = g_mime_parser_new ();
--    g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+-    g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("$srcdir/test/corpora/crypto/basic-encrypted.eml", "r", &error));
 -    if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
 -
 -    body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
--    if (body == NULL) return !!	fprintf (stderr, "did not find a multipart encrypted message\n");
+-    if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
 -
 -    output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
 -    if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
@@ -76,11 +57,11 @@ index 8b80f0e0..8e5fd4ce 100755
 -        printf 'No.\nCould not make tempdir for testing session-key support.\n'
 -        errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
--           && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+-           && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
 -           && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
 -           && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
 -    then
--        printf "OK.\n"
+         printf "OK.\n"
 -    else
 -        cat <<EOF
 -No.
@@ -102,19 +83,9 @@ index 8b80f0e0..8e5fd4ce 100755
 -    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
 -        rm -rf "$TEMP_GPG"
 -    fi
-+    printf "OK.\n"
- else
-     have_gmime=0
-     printf "No.\n"
-@@ -581,7 +516,7 @@ else
- fi
  
- if ! pkg-config --exists zlib; then
--  ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
-+  ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
-   compat/gen_zlib_pc > compat/zlib.pc &&
-   PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
-   export PKG_CONFIG_PATH
+     # see https://github.com/jstedfast/gmime/pull/90
+     # should be fixed in GMime in 3.2.7, but some distros might patch
 -- 
-2.22.0.rc1.479.gd8fdbe21b5
+2.28.0.rc2.21.g5c06d60fc5
 
diff --git a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
new file mode 100644
index 00000000000..49b5b3a0795
--- /dev/null
+++ b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
@@ -0,0 +1,102 @@
+From c6188909672b425fda3d0ecc0ec5163251064324 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 27 Jul 2020 22:49:47 +0700
+Subject: [PATCH] configure: drop gmime x509 certificate validity check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The problem has been fixed with gmime 3.2.7 already.
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ configure | 70 -------------------------------------------------------
+ 1 file changed, 70 deletions(-)
+
+diff --git a/configure b/configure
+index 99b0c328..ef602d10 100755
+--- a/configure
++++ b/configure
+@@ -472,78 +472,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+     # see https://github.com/jstedfast/gmime/pull/90
+     # should be fixed in GMime in 3.2.7, but some distros might patch
+     printf "Checking for GMime X.509 certificate validity... "
+-
+-    cat > _check_x509_validity.c <<EOF
+-#include <stdio.h>
+-#include <gmime/gmime.h>
+-
+-int main () {
+-    GError *error = NULL;
+-    GMimeParser *parser = NULL;
+-    GMimeApplicationPkcs7Mime *body = NULL;
+-    GMimeSignatureList *sig_list = NULL;
+-    GMimeSignature *sig = NULL;
+-    GMimeCertificate *cert = NULL;
+-    GMimeObject *output = NULL;
+-    GMimeValidity validity = GMIME_VALIDITY_UNKNOWN;
+-    int len;
+-
+-    g_mime_init ();
+-    parser = g_mime_parser_new ();
+-    g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("$srcdir/test/corpora/pkcs7/smime-onepart-signed.eml", "r", &error));
+-    if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/pkcs7/smime-onepart-signed.eml\n");
+-
+-    body = GMIME_APPLICATION_PKCS7_MIME(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+-    if (body == NULL) return !!	fprintf (stderr, "did not find a application/pkcs7 message\n");
+-
+-    sig_list = g_mime_application_pkcs7_mime_verify (body, GMIME_VERIFY_NONE, &output, &error);
+-    if (error || output == NULL) return !! fprintf (stderr, "verify failed\n");
+-
+-    if (sig_list == NULL) return !! fprintf (stderr, "no GMimeSignatureList found\n");
+-    len = g_mime_signature_list_length (sig_list);
+-    if (len != 1) return !! fprintf (stderr, "expected 1 signature, got %d\n", len);
+-    sig = g_mime_signature_list_get_signature (sig_list, 0);
+-    if (sig == NULL) return !! fprintf (stderr, "no GMimeSignature found at position 0\n");
+-    cert = g_mime_signature_get_certificate (sig);
+-    if (cert == NULL) return !! fprintf (stderr, "no GMimeCertificate found\n");
+-    validity = g_mime_certificate_get_id_validity (cert);
+-    if (validity != GMIME_VALIDITY_FULL) return !! fprintf (stderr, "Got validity %d, expected %d\n", validity, GMIME_VALIDITY_FULL);
+-
+-    return 0;
+-}
+-EOF
+-    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
+-        printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
+-        errors=$((errors + 1))
+-    elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \
+-            && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
+-            && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
+-            && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
+-    then
+-        if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then
+             gmime_x509_cert_validity=1
+             printf "Yes.\n"
+-        else
+-            gmime_x509_cert_validity=0
+-            printf "No.\n"
+-            if pkg-config --exists "gmime-3.0 >= 3.2.7"; then
+-                cat <<EOF
+-*** Error: GMime fails to calculate X.509 certificate validity, and
+-is later than 3.2.7, which should have fixed this issue.
+-
+-Please follow up on https://github.com/jstedfast/gmime/pull/90 with
+-more details.
+-EOF
+-                errors=$((errors + 1))
+-            fi
+-        fi
+-    else
+-        printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n'
+-        errors=$((errors + 1))
+-    fi
+-    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+-        rm -rf "$TEMP_GPG"
+-    fi
+ 
+     # see https://dev.gnupg.org/T3464
+     # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1
+-- 
+2.28.0.rc2.21.g5c06d60fc5
+
diff --git a/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch b/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
new file mode 100644
index 00000000000..5de4f6ff5ce
--- /dev/null
+++ b/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
@@ -0,0 +1,101 @@
+From 9a5a11fca4e2236d7b559e511fcc686fd382b985 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 27 Jul 2020 23:00:13 +0700
+Subject: [PATCH] configure: drop gmime verify with session key check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The problem is fixed with gpgme 1.14.0.
+
+We'll force a conflicts with gpgme older than 1.14.0, so nothing to
+worry about.
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ configure | 66 -------------------------------------------------------
+ 1 file changed, 66 deletions(-)
+
+diff --git a/configure b/configure
+index ef602d10..204d46d9 100755
+--- a/configure
++++ b/configure
+@@ -478,74 +478,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+     # see https://dev.gnupg.org/T3464
+     # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1
+     printf "Checking signature verification when decrypting using session keys... "
+-
+-    cat > _verify_sig_with_session_key.c <<EOF
+-#include <stdio.h>
+-#include <gmime/gmime.h>
+-
+-int main () {
+-    GError *error = NULL;
+-    GMimeParser *parser = NULL;
+-    GMimeMultipartEncrypted *body = NULL;
+-    GMimeDecryptResult *result = NULL;
+-    GMimeSignatureList *sig_list = NULL;
+-    GMimeSignature *sig = NULL;
+-    GMimeObject *output = NULL;
+-    GMimeSignatureStatus status;
+-    int len;
+-
+-    g_mime_init ();
+-    parser = g_mime_parser_new ();
+-    g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("$srcdir/test/corpora/crypto/encrypted-signed.eml", "r", &error));
+-    if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/pkcs7/smime-onepart-signed.eml\n");
+-
+-    body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+-    if (body == NULL) return !!	fprintf (stderr, "did not find a multipart/encrypted message\n");
+-
+-    output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_NONE, "9:13607E4217515A70EC8DF9DBC16C5327B94577561D98AD1246FA8756659C7899", &result, &error);
+-    if (error || output == NULL) return !! fprintf (stderr, "decrypt failed\n");
+-
+-    sig_list = g_mime_decrypt_result_get_signatures (result);
+-    if (sig_list == NULL) return !! fprintf (stderr, "sig_list is NULL\n");
+-
+-    if (sig_list == NULL) return !! fprintf (stderr, "no GMimeSignatureList found\n");
+-    len = g_mime_signature_list_length (sig_list);
+-    if (len != 1) return !! fprintf (stderr, "expected 1 signature, got %d\n", len);
+-    sig = g_mime_signature_list_get_signature (sig_list, 0);
+-    if (sig == NULL) return !! fprintf (stderr, "no GMimeSignature found at position 0\n");
+-    status = g_mime_signature_get_status (sig);
+-    if (status & GMIME_SIGNATURE_STATUS_KEY_MISSING) return !! fprintf (stderr, "signature status contains KEY_MISSING (see https://dev.gnupg.org/T3464)\n");
+-
+-    return 0;
+-}
+-EOF
+-    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
+-        printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
+-        errors=$((errors + 1))
+-    elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \
+-            && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-            && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
+-    then
+-        if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
+             gmime_verify_with_session_key=1
+             printf "Yes.\n"
+-        else
+-            gmime_verify_with_session_key=0
+-            printf "No.\n"
+-            cat <<EOF
+-*** Error: GMime fails to verify signatures when decrypting with a session key.
+-
+-This is most likely due to a buggy version of GPGME, which should be fixed in 1.13.2 or later.
+-See https://dev.gnupg.org/T3464 for more details.
+-EOF
+-        fi
+-    else
+-        printf 'No.\nFailed to set up gpg for testing signature verification while decrypting with a session key.\n'
+-        errors=$((errors + 1))
+-    fi
+-    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+-        rm -rf "$TEMP_GPG"
+-    fi
+ else
+     have_gmime=0
+     printf "No.\n"
+-- 
+2.28.0.rc2.21.g5c06d60fc5
+
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 2c898538069..d9bba6a03b8 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,17 +1,26 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.29.3
-revision=4
-hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel texinfo"
-makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
+version=0.30
+revision=1
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
+makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
+ python3-cffi python3-setuptools gnupg2"
+depends="gmime3>=3.2.7"
+checkdepends="python3-pytest mdocml dtach gdb tar xz"
 short_desc="Thread-based email index, search, and tagging"
 maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
-checksum=d5f704b9a72395e43303de9b1f4d8e14dd27bf3646fdbb374bb3dbb7d150dc35
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
+ https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
+checksum="5e3baa6fe11d65c67e26ae488be11b320bae04e336acc9c64621f7e3449096fa
+ 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
+skip_extraction="database-v1.tar.xz"
 
-subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+# Not a real conflicts, but this package is broken with gpgme 1.13.1-
+# gpgme is optional dependency
+conflicts="gpgme<1.14.0_1"
+subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python3"
 patch_args=-Np1
 
 if [ ! "$CROSS_BUILD" ]; then
@@ -25,25 +34,35 @@ else
 fi
 
 do_configure() {
+	ln -sf /usr/bin/gpg2 $XBPS_WRAPPERDIR/gpg
 	./configure --prefix=/usr \
 		--bashcompletiondir=/usr/share/bash-completion/completions \
 		--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
 }
 
 do_build() {
-	make ${makejobs} V=1
+	make ${makejobs}
 	make -C contrib/notmuch-mutt
 	cd bindings/python
-	python2 setup.py build --build-base=build-2
-	python3 setup.py build --build-base=build-3
+	python3 setup.py build --build-base=build
+}
+
+do_check() {
+	# We want wrapper-dirs included for gpg being gpg2
+	# But we don't want to use date wrapper in check
+	unset SOURCE_DATE_EPOCH
+	PATH=$XBPS_WRAPPERDIR:$PATH
+	cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
+		test/test-databases
+	# 2 tests is failing on musl
+	# glibc is clean
+	make test
 }
 
 do_install() {
 	make DESTDIR=${DESTDIR} install
 	pushd bindings/python
-	python2 setup.py build --build-base=build-2 \
-		install --prefix=/usr --root=${DESTDIR}
-	python3 setup.py build --build-base=build-3 \
+	python3 setup.py build --build-base=build \
 		install --prefix=/usr --root=${DESTDIR}
 	popd
 	if [ ! "$CROSS_BUILD" ]; then
@@ -95,28 +114,17 @@ notmuch-mutt_package() {
 	}
 }
 
-notmuch-python_package() {
-	archs=noarch
-	depends="libnotmuch>=${version}_${revision}"
-	short_desc+=" - Python2 bindings"
-	pycompile_module="notmuch"
-	pkg_install() {
-		vmove ${py2_sitelib}
-	}
-}
-
 notmuch-python3_package() {
 	archs=noarch
-	depends="libnotmuch>=${version}_${revision}"
-	short_desc+=" - Python3 bindings"
-	pycompile_module="notmuch"
+	depends="libnotmuch-${version}_${revision}"
+	short_desc+=" - Python 3 bindings"
 	pkg_install() {
 		vmove ${py3_sitelib}
 	}
 }
 
 notmuch-ruby_package() {
-	depends="libnotmuch>=${version}_${revision} ruby"
+	depends="libnotmuch-${version}_${revision} ruby"
 	short_desc+=" - Ruby bindings"
 	pkg_install() {
 		vmove usr/lib/ruby

From 9869006458ac2253a707fff13754bafe1871fc4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 29 Jul 2020 21:46:18 +0700
Subject: [PATCH 110/298] afew: update to 3.0.0.

---
 srcpkgs/afew/patches/afew-python-3.8.patch |  8 --------
 srcpkgs/afew/template                      | 16 ++++++++++------
 2 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/afew/patches/afew-python-3.8.patch

diff --git a/srcpkgs/afew/patches/afew-python-3.8.patch b/srcpkgs/afew/patches/afew-python-3.8.patch
deleted file mode 100644
index 6275d8f9d07..00000000000
--- a/srcpkgs/afew/patches/afew-python-3.8.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- afew/filters/__init__.py
-+++ afew/filters/__init__.py
-@@ -6,4 +6,4 @@
- 
- __all__ = list(filename[:-3]
-                for filename in glob.glob1(os.path.dirname(__file__), '*.py')
--               if filename is not '__init__.py')
-+               if filename != '__init__.py')
diff --git a/srcpkgs/afew/template b/srcpkgs/afew/template
index 9861d25fd5e..2b2614a4eba 100644
--- a/srcpkgs/afew/template
+++ b/srcpkgs/afew/template
@@ -1,19 +1,23 @@
 # Template file for 'afew'
 pkgname=afew
-version=2.0.0
-revision=4
+version=3.0.0
+revision=1
 archs=noarch
 build_style=python3-module
-pycompile_module="afew"
 hostmakedepends="python3-setuptools python3-Sphinx pkg-config"
-depends="notmuch-python3 python3-dkimpy python3-chardet"
-checkdepends="python3-pytest $depends"
+depends="notmuch-python3 python3-dkimpy python3-chardet notmuch"
+checkdepends="python3-pytest python3-freezegun $depends"
 short_desc="Initial tagging script for notmuch mail"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="ISC"
 homepage="https://github.com/afewmail/afew"
 distfiles="${PYPI_SITE}/a/afew/afew-${version}.tar.gz"
-checksum=1a685b97ddeba66d4af5ee9b2b76b1a8bccccd3d10bc285c8b82886a0328c048
+checksum=ec60b8587ffb286da8c5831e5da0378b8df3642a5164e667665453c8beef43a2
+
+post_patch() {
+	# version is pre-generated
+	vsed -i -e "s/'setuptools_scm'//" setup.py
+}
 
 post_build() {
 	python3 setup.py build_sphinx -b man

From 31b96f999ff12db4d2e98afbe85556f8804df27e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jul 2020 17:31:38 +0200
Subject: [PATCH 111/298] wireguard-dkms: update to 1.0.20200729.

---
 srcpkgs/wireguard-dkms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireguard-dkms/template b/srcpkgs/wireguard-dkms/template
index 1ac38f35ac7..a21066ff2f5 100644
--- a/srcpkgs/wireguard-dkms/template
+++ b/srcpkgs/wireguard-dkms/template
@@ -1,6 +1,6 @@
 # Template file for 'wireguard-dkms'
 pkgname=wireguard-dkms
-version=1.0.20200712
+version=1.0.20200729
 revision=1
 wrksrc="wireguard-linux-compat-${version}"
 build_wrksrc="src"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.wireguard.com/"
 distfiles="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"
-checksum=e15b3d4eb2cf186920a6ed13685187d6b846e59eb383c291913628682965ac95
+checksum=690c7d9e115e2ff27386811cb495c9784678f717c8d6fc4cc7469dce373f252e
 
 dkms_modules="wireguard ${version}"
 

From 467565dee1a8c980902aab9cf7d4c83bc8042c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 29 Jul 2020 23:16:43 +0700
Subject: [PATCH 112/298] pass: depends on which

* remove bash from checkdepends, it'll be provided by chroot-bash.
  And, having bash in checkdepends will cause trouble in cleanup.

* fake HOME variable when testing, since pass will spill a lot of file
  into $HOME
---
 srcpkgs/pass/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template
index a454f932b02..229bb79c70d 100644
--- a/srcpkgs/pass/template
+++ b/srcpkgs/pass/template
@@ -1,14 +1,13 @@
 # Template file for 'pass'
 pkgname=pass
 version=1.7.3
-revision=2
+revision=3
 archs=noarch
 wrksrc="password-store-${version}"
 build_style=gnu-makefile
 make_install_args="WITH_BASHCOMP=yes WITH_ZSHCOMP=yes WITH_FISHCOMP=yes"
-make_check_target=test
-depends="bash gnupg2 tree"
-checkdepends="${depends} git"
+depends="bash gnupg2 tree which"
+checkdepends="gnupg2 tree which git"
 short_desc="Stores, retrieves, generates, and synchronizes passwords securely"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -16,6 +15,11 @@ homepage="https://www.passwordstore.org"
 distfiles="https://git.zx2c4.com/password-store/snapshot/password-store-${version}.tar.xz"
 checksum=2b6c65846ebace9a15a118503dcd31b6440949a30d3b5291dfb5b1615b99a3f4
 
+do_check() {
+	mkdir -p fake-home
+	HOME=$(pwd)/fake-home make test
+}
+
 passmenu_package() {
 	short_desc="Dmenu-based interface to pass"
 	depends="dmenu xdotool ${sourcepkg}>=${version}_${revision}"

From cbdeb8afbe07b383a5621ce03028981d4ca99dac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 29 Jul 2020 23:18:59 +0700
Subject: [PATCH 113/298] pass-import: patch to use python3-magic

Noone else ships python3-file-magic, I don't want to maintain it.
---
 ...s-magic-refactor-get_magics-function.patch | 55 +++++++++++++++++++
 ...002-tools-magic-support-python-magic.patch | 31 +++++++++++
 srcpkgs/pass-import/template                  | 11 +++-
 3 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pass-import/patches/0001-tools-magic-refactor-get_magics-function.patch
 create mode 100644 srcpkgs/pass-import/patches/0002-tools-magic-support-python-magic.patch

diff --git a/srcpkgs/pass-import/patches/0001-tools-magic-refactor-get_magics-function.patch b/srcpkgs/pass-import/patches/0001-tools-magic-refactor-get_magics-function.patch
new file mode 100644
index 00000000000..bd9511f391e
--- /dev/null
+++ b/srcpkgs/pass-import/patches/0001-tools-magic-refactor-get_magics-function.patch
@@ -0,0 +1,55 @@
+From 5a1bff33c692be2fc1add61e642111976858c672 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 27 Jul 2020 17:31:06 +0700
+Subject: [PATCH] tools/magic: refactor get_magics function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In a later patch, we will add support for python-magic.
+Refactore get_magics function to prepare for that change.
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ pass_import/tools.py | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git pass_import/tools.py pass_import/tools.py
+index 257f01a..815ff8b 100644
+--- pass_import/tools.py
++++ pass_import/tools.py
+@@ -39,20 +39,26 @@ def get_magics(path):
+     with open(path, 'rb') as file:
+         header = file.read(2048)
+ 
+-    res = magic.detect_from_content(header)
++    if hasattr(magic, 'detect_from_content'):
++        res = magic.detect_from_content(header)
++        mime_type = res.mime_type
++        magic_name = res.name
++    else:
++        return None, None
++
+     mime_to_format = {
+         'application/pgp': 'gpg',
+         'application/x-sqlite3': 'sqlite3'
+     }
+     name_to_format = {'KDBX': 'kdbx', 'openssl': 'openssl', 'PGP': 'gpg'}
+ 
+-    frmt = mime_to_format.get(res.mime_type, None)
++    frmt = mime_to_format.get(mime_type, None)
+     for name in name_to_format:
+-        if name in res.name:
++        if name in magic_name:
+             frmt = name_to_format[name]
+ 
+     encoding = None  # res.encoding
+-    if 'UTF-8 Unicode (with BOM)' in res.name:
++    if 'UTF-8 Unicode (with BOM)' in magic_name:
+         encoding = 'utf-8-sig'
+ 
+     return frmt, encoding
+-- 
+2.28.0.163.g6104cc2f0b
+
diff --git a/srcpkgs/pass-import/patches/0002-tools-magic-support-python-magic.patch b/srcpkgs/pass-import/patches/0002-tools-magic-support-python-magic.patch
new file mode 100644
index 00000000000..65b186a9d66
--- /dev/null
+++ b/srcpkgs/pass-import/patches/0002-tools-magic-support-python-magic.patch
@@ -0,0 +1,31 @@
+From 8cbcd2bdd885c1028065f06b7ab02673c544720b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 27 Jul 2020 18:00:15 +0700
+Subject: [PATCH] tools/magic: support python-magic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ pass_import/tools.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git pass_import/tools.py pass_import/tools.py
+index 815ff8b..c1a3f01 100644
+--- pass_import/tools.py
++++ pass_import/tools.py
+@@ -43,6 +43,9 @@ def get_magics(path):
+         res = magic.detect_from_content(header)
+         mime_type = res.mime_type
+         magic_name = res.name
++    elif hasattr(magic, 'from_buffer'):
++        mime_type = magic.from_buffer(header, mime=True)
++        magic_name = magic.from_buffer(header)
+     else:
+         return None, None
+ 
+-- 
+2.28.0.163.g6104cc2f0b
+
diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 758270542ac..ac7590bea99 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,16 +1,21 @@
 # Template file for 'pass-import'
 pkgname=pass-import
 version=3.0
-revision=2
+revision=3
 archs=noarch
 build_style=gnu-makefile
-make_install_args=BASHCOMPDIR=/usr/share/bash-completion/completions
 hostmakedepends="python3-setuptools python3-yaml"
-depends="pass>=1.7.0 python3-defusedxml python3-file-magic
+depends="pass>=1.7.0 python3-defusedxml python3-magic
  python3-cryptography python3-SecretStorage python3-pykeepass"
+checkdepends="pass python3-defusedxml python3-magic python3-cryptography
+ python3-SecretStorage python3-pykeepass"
 short_desc="Pass extension for importing data from most existing password managers"
 maintainer="Alan Brown <adbrown@rocketmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/roddhjav/pass-import"
 distfiles="https://github.com/roddhjav/pass-import/releases/download/v${version}/pass-import-${version}.tar.gz"
 checksum=14f6708df990b88c54b07e722686ed9e1a639300b33d2ff83dd87845e44779fc
+
+do_check() {
+	python3 setup.py test
+}

From e8973956b53e3d11d519238d2f9a6a56349b4d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 29 Jul 2020 23:19:48 +0700
Subject: [PATCH 114/298] python3-file-magic: drop

pass-import have been patched to use python3-magic instead
---
 srcpkgs/python3-file-magic/template | 31 -----------------------------
 srcpkgs/python3-file-magic/update   |  2 --
 2 files changed, 33 deletions(-)
 delete mode 100644 srcpkgs/python3-file-magic/template
 delete mode 100644 srcpkgs/python3-file-magic/update

diff --git a/srcpkgs/python3-file-magic/template b/srcpkgs/python3-file-magic/template
deleted file mode 100644
index 8a6c0dd96b5..00000000000
--- a/srcpkgs/python3-file-magic/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python3-file-magic'
-# Don't merge python3-file-magic into file
-
-_file_ver=5.39
-_file_minver=5.34
-
-pkgname=python3-file-magic
-version=0.4.0
-revision=1
-wrksrc=file-${_file_ver}
-build_wrksrc=python
-archs=noarch
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="libmagic>=${_file_minver}_1"
-checkdepends="$depends"
-short_desc="File type identification utility"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
-license="BSD-2-Clause"
-homepage="http://www.darwinsys.com/file/"
-distfiles="https://astron.com/pub/file/file-${_file_ver}.tar.gz"
-checksum=f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1
-conflicts="python3-magic>=0"
-
-do_check() {
-	: detect_from_content report application/octet-stream on Python Script
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-file-magic/update b/srcpkgs/python3-file-magic/update
deleted file mode 100644
index ede7010028a..00000000000
--- a/srcpkgs/python3-file-magic/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://pypi.org/simple/file-magic
-pkgname=file-magic

From a4e9173e6d674b2a13e06236b10670b65ccd91d2 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 8 Jul 2020 11:05:49 +0200
Subject: [PATCH 115/298] firejail: add patch to fix firefox under firejail

Close: #20226
---
 srcpkgs/firejail/patches/fix-firefox.patch | 21 +++++++++++++++++++++
 srcpkgs/firejail/template                  |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/firejail/patches/fix-firefox.patch

diff --git a/srcpkgs/firejail/patches/fix-firefox.patch b/srcpkgs/firejail/patches/fix-firefox.patch
new file mode 100644
index 00000000000..e6e66f221b1
--- /dev/null
+++ b/srcpkgs/firejail/patches/fix-firefox.patch
@@ -0,0 +1,21 @@
+From f62c62c436748b0e45886bef9425748000a11135 Mon Sep 17 00:00:00 2001
+From: Antz <antzz@protonmail.ch>
+Date: Mon, 20 Jan 2020 16:30:44 +0100
+Subject: [PATCH] Fix firefox (#3171)
+
+---
+ etc/whitelist-usr-share-common.inc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/etc/whitelist-usr-share-common.inc b/etc/whitelist-usr-share-common.inc
+index 322bdefe9..78b947750 100644
+--- a/etc/whitelist-usr-share-common.inc
++++ b/etc/whitelist-usr-share-common.inc
+@@ -27,6 +27,7 @@ whitelist /usr/share/hunspell
+ whitelist /usr/share/hwdata
+ whitelist /usr/share/icons
+ whitelist /usr/share/knotifications5
++whitelist /usr/share/icu
+ whitelist /usr/share/kservices5
+ whitelist /usr/share/Kvantum
+ whitelist /usr/share/kxmlgui5
diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template
index ad59f175933..c2daaf4e4a2 100644
--- a/srcpkgs/firejail/template
+++ b/srcpkgs/firejail/template
@@ -1,7 +1,7 @@
 # Template file for 'firejail'
 pkgname=firejail
 version=0.9.62
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-apparmor"
 hostmakedepends="pkg-config"
@@ -14,6 +14,7 @@ homepage="https://firejail.wordpress.com"
 distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz"
 checksum=fcdc73f9a329394d3d38cab0f3724ccb08d165682a4451e9798d41882a7c031b
 conf_files="/etc/firejail/* /etc/apparmor.d/local/firejail-local"
+patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --disable-seccomp"

From d26bc120d52f21812f7cc17e0a902d40765b80f5 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 28 Jul 2020 10:47:33 +0530
Subject: [PATCH 116/298] sigil: update to 1.3.0

---
 srcpkgs/sigil/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 98143972241..c1392099583 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.2.0
+version=1.3.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -13,14 +13,14 @@ makedepends="zlib-devel qt5-tools-devel qt5-svg-devel
  qt5-declarative-devel qt5-location-devel qt5-webchannel-devel
  qt5-plugin-odbc qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
  boost-devel hunspell-devel python3-devel minizip-devel"
-depends="desktop-file-utils python3-lxml"
+depends="desktop-file-utils python3-lxml python3-css-parser"
 short_desc="Multi-platform EPUB ebook editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=34c7c5c707375b561f00341509e59ae7036e893af06859ca8dbcebd5cf125758
-python_version=2 #unverified
+checksum=ac302328f0d0e0144e67bd4cbd7834650eb219f81a623f393271bf6f0686cc56
+python_version=3
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) broken="depends on qt5-webengine";;

From 2127ee880347270913a5686b97bf6d640c3a3b73 Mon Sep 17 00:00:00 2001
From: Artem Zhurikhin <ashpool@xecut.net>
Date: Mon, 27 Jul 2020 18:58:16 +0300
Subject: [PATCH 117/298] qalculate: update to 3.12.0.

---
 srcpkgs/qalculate/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 80f0000aa2a..ff2876559d3 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
 pkgname=qalculate
-version=3.11.0
+version=3.12.0
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -9,11 +9,11 @@ hostmakedepends="intltool pkg-config doxygen"
 makedepends="libxml2-devel cln-devel readline-devel libcurl-devel icu-devel
  mpfr-devel"
 short_desc="Multi-purpose desktop calculator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=6992ff25774a15d6a0b09542b1f137dd5dc00995dfe9a765205ec2da39b4e13f
+checksum=ff6b56c2afbed4c37b37869fde3b45610722fa4bb4b802c84f7cb387968fbc68
 
 libqalculate-data_package() {
 	archs=noarch

From 1e58dad2898d085c838ad6434563231eb65120a9 Mon Sep 17 00:00:00 2001
From: Artem Zhurikhin <ashpool@xecut.net>
Date: Mon, 27 Jul 2020 18:58:22 +0300
Subject: [PATCH 118/298] qalculate-gtk: update to 3.12.0.

---
 srcpkgs/qalculate-gtk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index fdd58c3c712..3df165c8d4a 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,15 +1,15 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
 pkgname=qalculate-gtk
-version=3.11.0
+version=3.12.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="libqalculate-devel gtk+3-devel"
 depends="gnuplot"
 short_desc="Multi-purpose desktop calculator - GTK+ version"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=eb2a0502e9c5e93b43d2b2c42608bbafd475d70caf236a51285fea606d9d3167
+checksum=463151f21720c5596571b9c80036612c8fbc156e9e2d85a617d715fdd2964d51

From d2b1d748fc055a7f602081a6e6a34a168f0a0ec4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 7 Jul 2020 13:40:08 +0300
Subject: [PATCH 119/298] rsyslog: update to 8.2006.0.

---
 srcpkgs/rsyslog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 32eb6646d1f..d1734805dd9 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,6 +1,6 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
-version=8.2004.0
+version=8.2006.0
 revision=1
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later, Apache-2.0"
 homepage="https://www.rsyslog.com"
 changelog="https://raw.githubusercontent.com/rsyslog/rsyslog/master/ChangeLog"
 distfiles="${homepage}/files/download/rsyslog/${pkgname}-${version}.tar.gz"
-checksum=5fc3d7b775f0879a40606d960491812a602e22f62e006ce027ed7bcf4c9f27d9
+checksum=d9589e64866f2fdc5636af4cae9d60ebf1e3257bb84b81ee953ede6a05878e97
 conf_files="/etc/rsyslog.conf"
 make_dirs="/etc/rsyslog.d 0755 root root"
 lib32disabled=yes

From adc0961ab4b23bb9dca8e22cd1a1078adc1a2bef Mon Sep 17 00:00:00 2001
From: Dash Eclipse <dash@ezup.dev>
Date: Tue, 28 Jul 2020 19:57:59 +0000
Subject: [PATCH 120/298] grim: update to 1.3.1

---
 srcpkgs/grim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template
index d0e5571ca3d..896434db405 100644
--- a/srcpkgs/grim/template
+++ b/srcpkgs/grim/template
@@ -1,6 +1,6 @@
 # Template file for 'grim'
 pkgname=grim
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=meson
 configure_args="-Djpeg=enabled"
@@ -11,7 +11,7 @@ maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://wayland.emersion.fr/grim/"
 distfiles="https://github.com/emersion/$pkgname/archive/v$version.tar.gz"
-checksum=9cbad6d008a3587cb7968b561a94069cdd73e7be1f03f0073c320c1f554a3738
+checksum=b1ab720b5dbcd560cfa34bbd7e0cbe85330f701c471b12e2489dfec15bcf216e
 
 post_install() {
 	vlicense LICENSE

From cc4abff22f6dc79b0c9e066ce9ac42b3eef7da4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Sat, 29 Feb 2020 16:35:39 +0100
Subject: [PATCH 121/298] New package: osm2pgsql-1.3.0

---
 srcpkgs/osm2pgsql/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/osm2pgsql/template

diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
new file mode 100644
index 00000000000..aba55690852
--- /dev/null
+++ b/srcpkgs/osm2pgsql/template
@@ -0,0 +1,13 @@
+# Template file for 'osm2pgsql'
+pkgname=osm2pgsql
+version=1.3.0
+revision=1
+build_style=cmake
+hostmakedepends="boost python3 python-psycopg2"
+makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel postgresql-libs-devel lua52-devel"
+short_desc="Tool for loading OpenStreetMap data into a PostgreSQL database"
+maintainer="Nýx <n.y.x@bluewin.ch>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/openstreetmap/osm2pgsql"
+distfiles="https://github.com/openstreetmap/${pkgname}/archive/${version}.tar.gz"
+checksum=1c0f229047491cf7d054c6f8fcb846eb3163c336340fa82035e19cc2bb7f0179

From 6c6897aa8d0b25095be359e5f6acf8d3096d598c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 29 Jul 2020 20:16:16 +0200
Subject: [PATCH 122/298] vlc: update to 3.0.11.1.

---
 srcpkgs/vlc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index aa324e9fde1..29afebb804e 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.11
-revision=3
+version=3.0.11.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.videolan.org/vlc/"
 changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
 distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz"
-checksum=3e94a1acf33445e9da15d528aa48657aa26b912eaa2656b403d43860a8834919
+checksum=189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8
 
 lib32disabled=yes
 

From 8fe7e9f759ca3c20d9d51c586dd3bb947cd91a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:18:26 +0200
Subject: [PATCH 123/298] lua53-luasec: install into proper path

---
 srcpkgs/lua53-luasec/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index e2ca04a010c..a5700cd2e08 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,9 +1,11 @@
 # Template file for 'lua53-luasec'
 pkgname=lua53-luasec
 version=0.8.1
-revision=3
+revision=4
 wrksrc="luasec-luasec-${version}"
 build_style=gnu-makefile
+make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
+make_install_args="${make_build_args}"
 hostmakedepends="lua53"
 makedepends="lua53-devel libressl-devel"
 depends="lua53"

From ad85989593e48cc6afc57210865fc04ad8f00a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 19:49:01 +0200
Subject: [PATCH 124/298] python3-pyinfra: remove tests

---
 srcpkgs/python3-pyinfra/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index d41fade8908..dd18497b965 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
 version=1.0.4
-revision=1
+revision=2
 archs=noarch
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -21,5 +21,6 @@ post_extract() {
 }
 
 post_install() {
+	rm -r ${DESTDIR}/${py3_sitelib}/tests
 	vlicense LICENSE.md
 }

From 9425cce2171e7cd70aa2281917c6e3e356f57321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 19:49:02 +0200
Subject: [PATCH 125/298] python3-pure-protobuf: remove tests

---
 srcpkgs/python3-pure-protobuf/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pure-protobuf/template b/srcpkgs/python3-pure-protobuf/template
index ffbbf446a3f..2c23b4204f7 100644
--- a/srcpkgs/python3-pure-protobuf/template
+++ b/srcpkgs/python3-pure-protobuf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pure-protobuf'
 pkgname=python3-pure-protobuf
 version=2.0.0
-revision=1
+revision=2
 archs=noarch
 wrksrc=protobuf-${version}
 build_style=python3-module
@@ -16,5 +16,6 @@ distfiles="https://github.com/eigenein/protobuf/archive/${version}.tar.gz"
 checksum=e1303e8ae29ce5e33254d49f93d896d04b040070f89e87232e33ecdfbb4ea6d9
 
 post_install() {
+	rm -r ${DESTDIR}/${py3_sitelib}/tests
 	vlicense LICENSE
 }

From ee3f866436c93b976f679d36cc9428261f772496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 19:49:02 +0200
Subject: [PATCH 126/298] python3-crccheck: remove tests

---
 srcpkgs/python3-crccheck/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-crccheck/template b/srcpkgs/python3-crccheck/template
index fbffedfb784..a0a86e0ae2c 100644
--- a/srcpkgs/python3-crccheck/template
+++ b/srcpkgs/python3-crccheck/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-crccheck'
 pkgname=python3-crccheck
 version=0.6
-revision=1
+revision=2
 archs=noarch
 wrksrc="crccheck-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools unzip"
+hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Calculation library for CRCs and Checksums"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/martin_scharrer/crccheck"
 distfiles="${PYPI_SITE}/c/crccheck/crccheck-${version}.zip"
 checksum=5686a4e5c3a2949597316c067c49c21e06051d13de9521434480cfa24dad7e32
+
+post_install() {
+	rm -r ${DESTDIR}/${py3_sitelib}/tests
+}

From 78780ec9116b78868e2f4420b838d3699c329048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 19:49:03 +0200
Subject: [PATCH 127/298] python3-Telethon: remove tests

---
 srcpkgs/python3-Telethon/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Telethon/template b/srcpkgs/python3-Telethon/template
index ff62ee99a67..25ccd5200e5 100644
--- a/srcpkgs/python3-Telethon/template
+++ b/srcpkgs/python3-Telethon/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Telethon'
 pkgname=python3-Telethon
 version=1.13.0
-revision=1
+revision=2
 archs=noarch
 wrksrc="Telethon-${version}"
 build_style=python3-module
@@ -15,5 +15,6 @@ distfiles="https://github.com/LonamiWebs/Telethon/archive/v${version}.tar.gz"
 checksum=a3d6813fd63ec71756a6aff3a59480ff07a137f90b4d2231f4616483e66a4ade
 
 post_install() {
+	rm -r ${DESTDIR}/${py3_sitelib}/tests
 	vlicense LICENSE
 }

From 41d7829f741e456a558b372a32f99ba341a9b280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 19:49:03 +0200
Subject: [PATCH 128/298] etesync-dav: remove tests

---
 srcpkgs/etesync-dav/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/etesync-dav/template b/srcpkgs/etesync-dav/template
index 932c54e3e53..03763f96644 100644
--- a/srcpkgs/etesync-dav/template
+++ b/srcpkgs/etesync-dav/template
@@ -1,9 +1,8 @@
 # Template file for 'etesync-dav'
 pkgname=etesync-dav
 version=0.17.1
-revision=1
+revision=2
 archs=noarch
-wrksrc="etesync-dav-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-etesync radicale2 python3-Flask python3-Flask-WTF"
@@ -18,3 +17,7 @@ checksum=2d7018e3a0af8c203671eed4098f970d629876d17b235d434a595a5056aa7972
 do_check() {
 	pytest3
 }
+
+post_install() {
+	rm -r ${DESTDIR}/${py3_sitelib}/tests
+}

From 179bf1cd04f3d8d22a420cec1c831ef89ae208a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 19:49:03 +0200
Subject: [PATCH 129/298] bCNC: remove tests

---
 srcpkgs/bCNC/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/bCNC/template b/srcpkgs/bCNC/template
index 054a118ecfb..2e715c512a9 100644
--- a/srcpkgs/bCNC/template
+++ b/srcpkgs/bCNC/template
@@ -1,7 +1,7 @@
 # Template file for 'bCNC'
 pkgname=bCNC
 version=0.9.14.306
-revision=1
+revision=2
 archs=noarch
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,6 +19,7 @@ post_install() {
 	ln -s "/${py3_sitelib}/bCNC/bCNC.desktop" "${DESTDIR}/usr/share/applications/"
 	ln -s "/${py3_sitelib}/bCNC/bCNC.png" "${DESTDIR}/usr/share/pixmaps/"
 	ln -s "bCNC" "${DESTDIR}/usr/bin/bcnc"
+	rm -r ${DESTDIR}/${py3_sitelib}/tests
 }
 
 bcnc_package() {

From 324c4d4efd0f6dc21a5dc7ec4f1925d89b2356db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:28:49 +0200
Subject: [PATCH 130/298] libphobos2.081: conflict with libphobos

---
 srcpkgs/dmd2.081/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dmd2.081/template b/srcpkgs/dmd2.081/template
index e3b6cfa1f93..6bb0d3160ab 100644
--- a/srcpkgs/dmd2.081/template
+++ b/srcpkgs/dmd2.081/template
@@ -1,7 +1,7 @@
 # Template file for 'dmd2.081'
 pkgname=dmd2.081
 version=2.081.1
-revision=1
+revision=2
 create_wrksrc=yes
 hostmakedepends="which"
 makedepends="dmd-bootstrap"
@@ -75,7 +75,6 @@ do_install() {
 dmd2.081-doc_package() {
 	short_desc="Documentation and sample code for D programming language"
 	replaces="dmd-docs>=0"
-	license="Boost License"
 
 	pkg_install() {
 		cd dmd2
@@ -92,8 +91,7 @@ dmd2.081-doc_package() {
 
 libphobos2.081_package() {
 	short_desc+=" - standard library"
-	license="Boost License"
-	conflicts="dmd-bootstrap"
+	conflicts="dmd-bootstrap libphobos"
 	pkg_install() {
 		vinstall ${wrksrc}/druntime/generated/linux/release/$_archbits/libdruntime.a 644 usr/lib libdruntime.a
 		vinstall ${wrksrc}/phobos/generated/linux/release/$_archbits/libphobos2.a 644 usr/lib libphobos2.a

From 4b0f6bc81ff6c2b09b27232585fa97fd86b79039 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jul 2020 14:29:05 -0400
Subject: [PATCH 131/298] protobuf23: update to 3.12.4.

---
 srcpkgs/protobuf23/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protobuf23/template b/srcpkgs/protobuf23/template
index 38b070a6ed5..3f0a67dba90 100644
--- a/srcpkgs/protobuf23/template
+++ b/srcpkgs/protobuf23/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf23'
 pkgname=protobuf23
-version=3.12.3
+version=3.12.4
 revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=71030a04aedf9f612d2991c1c552317038c3c5a2b578ac4745267a45e7037c29
+checksum=512e5a674bf31f8b7928a64d8adf73ee67b8fe88339ad29adaa3b84dbaa570d8
 
 # Switch to versioned package
 replaces="protobuf<=3.11.4_1"

From 7a549275b3b14270374007a2fdfd81355b7b0a08 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 29 Jul 2020 14:29:08 -0400
Subject: [PATCH 132/298] protobuf: update to 3.12.4.

---
 srcpkgs/protobuf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 39f8e9f9632..bb8890f1299 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf'
 pkgname=protobuf
-version=3.12.3
+version=3.12.4
 revision=1
 archs=noarch
 build_style=meta

From 3806ffe763c21e0e9edbf020551378dfeab1b20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 29 Jul 2020 23:25:38 +0200
Subject: [PATCH 133/298] leptonica: update to 1.80.0

---
 srcpkgs/leptonica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leptonica/template b/srcpkgs/leptonica/template
index 9a29bba3a03..9461bb050d3 100644
--- a/srcpkgs/leptonica/template
+++ b/srcpkgs/leptonica/template
@@ -1,6 +1,6 @@
 # Template file for 'leptonica'
 pkgname=leptonica
-version=1.79.0
+version=1.80.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"
 homepage="http://leptonica.org/"
 distfiles="http://leptonica.org/source/${pkgname}-${version}.tar.gz"
-checksum=045966c9c5d60ebded314a9931007a56d9d2f7a6ac39cb5cc077c816f62300d8
+checksum=ec9c46c2aefbb960fb6a6b7f800fe39de48343437b6ce08e30a8d9688ed14ba4
 
 post_install() {
 	vdoc moller52.jpg

From 67b08de48a950903712080462cd2c6e33ae97c46 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 29 Jul 2020 23:20:22 +0200
Subject: [PATCH 134/298] scryer-prolog: broken on anything but x86 and arm

---
 srcpkgs/scryer-prolog/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index d1a4a585ef7..217ae275fd1 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -20,6 +20,11 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/29779/steps/shell_3/logs/stdio"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e365053749c03e5642b65582b8390cbe049cc768 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 29 Jul 2020 23:22:42 +0200
Subject: [PATCH 135/298] boringtun: better broken=

---
 srcpkgs/boringtun/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/boringtun/template b/srcpkgs/boringtun/template
index d74a72f6c84..a3949732054 100644
--- a/srcpkgs/boringtun/template
+++ b/srcpkgs/boringtun/template
@@ -11,7 +11,8 @@ distfiles="https://github.com/cloudflare/${pkgname}/archive/v${version}.tar.gz"
 checksum=@7ba22dcb785c9dfa99d70fc3ea0fa86908debd59eabc278f65db50a22bcc731c
 
 case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="ftbfs in ring" ;;
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
 esac
 
 post_install() {

From d1f68d3ee2818a648745a01aeaa94320aafc9b0c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 29 Jul 2020 23:22:58 +0200
Subject: [PATCH 136/298] miniserve: better broken=

---
 srcpkgs/miniserve/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/miniserve/template b/srcpkgs/miniserve/template
index 137df991dfb..889e4846ff7 100644
--- a/srcpkgs/miniserve/template
+++ b/srcpkgs/miniserve/template
@@ -11,7 +11,8 @@ distfiles="https://github.com/svenstaro/miniserve/archive/v${version}.tar.gz"
 checksum=80ee5d661730ddad14671f961b560467f3b3a9f0544b9b11dec65098eb4a1f7e
 
 case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="ftbfs in ring" ;;
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
 esac
 
 post_install() {

From c2736b106c732b55bca40284fd968d0763970e46 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 29 Jul 2020 23:23:12 +0200
Subject: [PATCH 137/298] routinator: better broken=

---
 srcpkgs/routinator/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template
index c70484fcfea..4d9239c844a 100644
--- a/srcpkgs/routinator/template
+++ b/srcpkgs/routinator/template
@@ -12,7 +12,8 @@ distfiles="https://github.com/NLnetLabs/routinator/archive/v${version}.tar.gz"
 checksum=a84589789bdc76322deb29c78d6b14391c859967a4ae8f766a79d6b7a1fd16b2
 
 case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="ftbfs in ring" ;;
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
 esac
 
 post_install() {

From 879ecdb8da03b8044d3c17e514f294a680fdcbba Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 29 Jul 2020 23:23:25 +0200
Subject: [PATCH 138/298] rust-sccache: better broken=

---
 srcpkgs/rust-sccache/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index bbcadbeb6f4..dda7b73393e 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -14,7 +14,8 @@ distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
 checksum=34b8eaab25eb467e9796c2f3ad7524c8548bf3afed962a922dd0b40ed2472ef7
 
 case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="ftbfs in ring" ;;
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
 esac
 
 pre_build() {

From 335cce1cbe0d442c260c06babcc0e7880cca6e4b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 29 Jul 2020 23:24:06 +0200
Subject: [PATCH 139/298] chromium: is nocross and should work on ARMs

---
 srcpkgs/chromium/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 96a8953d335..aae904de440 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -3,13 +3,14 @@ pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
 version=84.0.4147.89
 revision=1
-archs="i686 x86_64*"
+archs="i686* x86_64* aarch64* armv7l*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
 checksum=17970d998c125b40765141f2cd346d1674f05dbd4a28fdcf31f9e3540890c679
+nocross=yes
 
 lib32disabled=yes
 nodebug=yes

From 56795b1000e45a96e13a3e8337258f31aace90db Mon Sep 17 00:00:00 2001
From: Felipe Nogueira <contato.fnog@gmail.com>
Date: Wed, 29 Jul 2020 16:28:19 -0300
Subject: [PATCH 140/298] font-ibm-plex-ttf: update to 5.1.0.

---
 srcpkgs/font-ibm-plex-ttf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-ibm-plex-ttf/template b/srcpkgs/font-ibm-plex-ttf/template
index 1cf14fe74af..98c9e838f9f 100644
--- a/srcpkgs/font-ibm-plex-ttf/template
+++ b/srcpkgs/font-ibm-plex-ttf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-ibm-plex-ttf'
 pkgname=font-ibm-plex-ttf
-version=5.0.0
+version=5.1.0
 revision=1
 archs=noarch
 wrksrc="plex-${version}"
@@ -10,7 +10,7 @@ maintainer="Felipe Nogueira <contato.fnog@gmail.com>"
 license="OFL-1.1"
 homepage="https://github.com/IBM/plex"
 distfiles="https://github.com/IBM/plex/archive/v${version}.tar.gz"
-checksum=15d42a87052ad8b9757889a0a0b9c3f1b8e212d251a302b2134f5641fda5f34f
+checksum=aeeb4025561c43da423a626ce6e3ca424bfc386c1e2f53523057870045f6e1f0
 
 font_dirs="/usr/share/fonts/TTF"
 

From b7bef7ae81e5d8b0a45be7caf9c1faa9e1743c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 29 Jul 2020 14:41:50 -0300
Subject: [PATCH 141/298] tree-wide: orphan packages maintained by djames.

- afterstep
- libdockapp
- simh
- wmclock
- wmmon
- wmsystemtray
---
 srcpkgs/afterstep/template    | 2 +-
 srcpkgs/libdockapp/template   | 2 +-
 srcpkgs/simh/template         | 2 +-
 srcpkgs/wmclock/template      | 2 +-
 srcpkgs/wmmon/template        | 2 +-
 srcpkgs/wmsystemtray/template | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/afterstep/template b/srcpkgs/afterstep/template
index 4ffc0b79905..6a9c1b9e3d6 100644
--- a/srcpkgs/afterstep/template
+++ b/srcpkgs/afterstep/template
@@ -8,7 +8,7 @@ configure_args="ac_cv_header_elf_h=no"
 hostmakedepends="pkg-config"
 makedepends="fltk-devel gtk+-devel"
 short_desc="Window Manager based on the look and feel of the NeXTStep interface"
-maintainer="Daniel James <djames@orcadian.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.afterstep.org/"
 distfiles="https://github.com/sashavasko/${pkgname}-devel/archive/${version}.tar.gz"
diff --git a/srcpkgs/libdockapp/template b/srcpkgs/libdockapp/template
index 48e560c0c55..602f6c3d6af 100644
--- a/srcpkgs/libdockapp/template
+++ b/srcpkgs/libdockapp/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="autoconf automake font-util libtool m4 pkg-config"
 makedepends="libX11-devel libXext-devel libXpm-devel"
 short_desc="DockApp Development Standard Library"
-maintainer="Daniel James <djames@orcadian.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
 homepage="http://www.dockapps.net/libdockapp"
 distfiles="http://www.dockapps.net/download/libdockapp-${version}.tar.gz"
diff --git a/srcpkgs/simh/template b/srcpkgs/simh/template
index c2f7ac6f999..6472752081d 100644
--- a/srcpkgs/simh/template
+++ b/srcpkgs/simh/template
@@ -7,7 +7,7 @@ create_wrksrc=yes
 hostmakedepends="libpcap-devel unzip"
 makedepends="libpcap-devel"
 short_desc="Emulator for historical computers including PDP-11 and VAX"
-maintainer="Daniel James <djames@orcadian.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://simh.trailing-edge.com/"
 distfiles="http://simh.trailing-edge.com/sources/simhv${version/.}-0.zip"
diff --git a/srcpkgs/wmclock/template b/srcpkgs/wmclock/template
index 6fd00fbc35d..bfede3a1f73 100644
--- a/srcpkgs/wmclock/template
+++ b/srcpkgs/wmclock/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
 makedepends="libX11-devel libXpm-devel libXext-devel"
 short_desc="Clock Dockapp for Window Maker"
-maintainer="Daniel James <djames@orcadian.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://www.dockapps.net/wmclock"
 distfiles="http://www.dockapps.net/download/wmclock-${version}.tar.gz"
diff --git a/srcpkgs/wmmon/template b/srcpkgs/wmmon/template
index c4f3ebed475..e634a641fef 100644
--- a/srcpkgs/wmmon/template
+++ b/srcpkgs/wmmon/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libdockapp-devel"
 short_desc="Window Maker dockapp for monitoring system information"
-maintainer="Daniel James <djames@orcadian.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.dockapps.net/wmmon"
 distfiles="http://www.dockapps.net/download/wmmon-${version}.tar.gz"
diff --git a/srcpkgs/wmsystemtray/template b/srcpkgs/wmsystemtray/template
index 15fafdb5135..f0a5c1c9624 100644
--- a/srcpkgs/wmsystemtray/template
+++ b/srcpkgs/wmsystemtray/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXext-devel libXfixes-devel libXmu-devel libXpm-devel"
 short_desc="System tray dockapp for Window Maker"
-maintainer="Daniel James <djames@orcadian.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://sourceforge.net/projects/wmsystemtray/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"

From 362e96caa582650e2edad1ef05e966e436007a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 30 Jul 2020 09:09:40 +0700
Subject: [PATCH 142/298] Revert "bison: update to 3.7."

This reverts commit fe1cae9869874cf9250cd4b9a98536a5f2eee7c0.

See: https://www.openwall.com/lists/musl/2020/07/30/3
---
 srcpkgs/bison/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template
index aee8acd7106..529f7b16c5d 100644
--- a/srcpkgs/bison/template
+++ b/srcpkgs/bison/template
@@ -1,7 +1,8 @@
 # Template file for 'bison'
 pkgname=bison
-version=3.7
-revision=1
+reverts="3.7_1"
+version=3.6.4
+revision=2
 build_style=gnu-configure
 hostmakedepends="help2man perl m4"
 depends="m4"
@@ -11,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bison/bison.html"
 distfiles="${GNU_SITE}/bison/bison-${version}.tar.xz"
-checksum=07b25fbf4de2f2c686e8bff50fdb69efda49b6f9f7377dad1884f9508a28592b
+checksum=8b13473b31ca7fcf65e5e8a74224368ffd5df19275602a9c9567ba393f18577d
 alternatives="
  yacc:yacc:/usr/bin/bison-yacc
  yacc:yacc.1:/usr/share/man/man1/bison-yacc.1"

From 2e14246f44937bd8d4995b4f3cd5dfb0b41a60e3 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 29 Jul 2020 20:58:25 -0500
Subject: [PATCH 143/298] New package: perl-YAML-PP-0.023

---
 srcpkgs/perl-YAML-PP/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/perl-YAML-PP/template

diff --git a/srcpkgs/perl-YAML-PP/template b/srcpkgs/perl-YAML-PP/template
new file mode 100644
index 00000000000..aca29c5def6
--- /dev/null
+++ b/srcpkgs/perl-YAML-PP/template
@@ -0,0 +1,14 @@
+# Template file for 'perl-YAML-PP'
+pkgname=perl-YAML-PP
+version=0.023
+revision=1
+wrksrc="${pkgname/perl-/}-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+depends="perl"
+short_desc="Perl YAML 1.2 processor"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/YAML-PP"
+distfiles="${CPAN_SITE}/YAML/YAML-PP-${version}.tar.gz"
+checksum=6aa83022edb73b4d547f22a3e2e3182f693be6442c5ec4d7a0238d929d3ce553

From 1ea7bafeb2db015af3d704e48fe5004d6bc99a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 30 Jul 2020 12:56:53 +0700
Subject: [PATCH 144/298] afterstep: cross-compile

While we're at it, move "*-config" and "*-libs" to "-devel" package.
---
 .../patches/50-cross-safe-min-max.patch       | 18 +++++++++++
 .../51-configure-pass-cross-alias-down.patch  | 13 ++++++++
 .../patches/52-libafterimage-cross.patch      | 30 +++++++++++++++++++
 srcpkgs/afterstep/template                    | 13 ++++++--
 4 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/afterstep/patches/50-cross-safe-min-max.patch
 create mode 100644 srcpkgs/afterstep/patches/51-configure-pass-cross-alias-down.patch
 create mode 100644 srcpkgs/afterstep/patches/52-libafterimage-cross.patch

diff --git a/srcpkgs/afterstep/patches/50-cross-safe-min-max.patch b/srcpkgs/afterstep/patches/50-cross-safe-min-max.patch
new file mode 100644
index 00000000000..71872c7763b
--- /dev/null
+++ b/srcpkgs/afterstep/patches/50-cross-safe-min-max.patch
@@ -0,0 +1,18 @@
+diff --git libAfterBase/configure.in libAfterBase/configure.in
+index 4bc2232..f250692 100644
+--- libAfterBase/configure.in
++++ libAfterBase/configure.in
+@@ -228,12 +228,7 @@ if test "x$enable_xlocale" = "xyes"; then
+ fi
+ 
+ dnl# Check for safe min/max - there still are some retarded compilers out there :
+-AC_MSG_CHECKING(if we can use sign safe min/max macros)
+-AC_TRY_RUN([#define MIN(x,y) \
+-  		({ const typeof(x) _x = (x); const typeof(y) _y = (y);  (void) (&_x == &_y); \
+-     		 _x < _y ? _x : _y; })
+-                 int main(){return MIN(0,1);}],
+-	   [AC_DEFINE(USE_SAFE_MINMAX,1,will use type-safe min/max macros) AC_MSG_RESULT(yes)],AC_MSG_RESULT(no))
++AC_DEFINE(USE_SAFE_MINMAX,1,will use type-safe min/max macros)
+ 
+ dnl# Translate enable_* from "yes/no" to "1/0" (for configure.h)
+ 
diff --git a/srcpkgs/afterstep/patches/51-configure-pass-cross-alias-down.patch b/srcpkgs/afterstep/patches/51-configure-pass-cross-alias-down.patch
new file mode 100644
index 00000000000..cc3f0f28db3
--- /dev/null
+++ b/srcpkgs/afterstep/patches/51-configure-pass-cross-alias-down.patch
@@ -0,0 +1,13 @@
+diff --git configure configure
+index bc9a30e..95e7b3a 100755
+--- configure
++++ configure
+@@ -6254,6 +6254,8 @@ FROM_AFTERSTEP_CONFIGURE=yes
+ export FROM_AFTERSTEP_CONFIGURE
+ 
+ _def_lib_conf_opts=" \
++	--build=${build_alias} \
++	--host=${host_alias} \
+ 	--prefix=${prefix} \
+ 	--exec-prefix=${exec_prefix} \
+ 	--bindir=${bindir} \
diff --git a/srcpkgs/afterstep/patches/52-libafterimage-cross.patch b/srcpkgs/afterstep/patches/52-libafterimage-cross.patch
new file mode 100644
index 00000000000..316d3221610
--- /dev/null
+++ b/srcpkgs/afterstep/patches/52-libafterimage-cross.patch
@@ -0,0 +1,30 @@
+diff --git libAfterImage/configure.in libAfterImage/configure.in
+index ca49a50..780e0ff 100644
+--- libAfterImage/configure.in
++++ libAfterImage/configure.in
+@@ -590,21 +590,21 @@ else
+ 					  )
+ 	  if test "x$have_ft2build" = "xno" ; then
+     	  	if test "x$have_freetype_freetype" = "xyes" ; then
+-			AC_TRY_RUN([#include <freetype/freetype.h>
++			AC_TRY_COMPILE([#include <freetype/freetype.h>
+                             	int main(){FT_Face f; return 0;}],
+ 	                   	[have_ttf=yes],AC_MSG_RESULT(no))
+ 	  	elif test "x$have_freetype" = "xyes" ; then
+-			AC_TRY_RUN([#include <freetype.h>
++			AC_TRY_COMPILE([#include <freetype.h>
+                             	int main(){FT_Face f; return 0;}],
+ 	                   	[have_ttf=yes],AC_MSG_RESULT(no))
+ 	  	fi;
+ 	  elif test "x$have_freetype_freetype" = "xyes" ; then
+-		AC_TRY_RUN([#include <ft2build.h> 
++		AC_TRY_COMPILE([#include <ft2build.h>
+ 			    #include <freetype/freetype.h>
+                             int main(){FT_Face f; return 0;}],
+ 	                [have_ttf=yes],AC_MSG_RESULT(no))
+ 	  elif test "x$have_freetype" = "xyes" ; then
+-		AC_TRY_RUN([#include <ft2build.h>
++		AC_TRY_COMPILE([#include <ft2build.h>
+ 			#include <freetype.h>
+                         int main(){FT_Face f; return 0;}],
+ 	                [have_ttf=yes],AC_MSG_RESULT(no))
diff --git a/srcpkgs/afterstep/template b/srcpkgs/afterstep/template
index 6a9c1b9e3d6..ba9c15546de 100644
--- a/srcpkgs/afterstep/template
+++ b/srcpkgs/afterstep/template
@@ -1,11 +1,11 @@
 # Template file for 'afterstep'
 pkgname=afterstep
 version=2.2.12
-revision=1
+revision=2
 wrksrc="${pkgname}-devel-${version}"
 build_style=gnu-configure
 configure_args="ac_cv_header_elf_h=no"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake libtool"
 makedepends="fltk-devel gtk+-devel"
 short_desc="Window Manager based on the look and feel of the NeXTStep interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,6 +14,11 @@ homepage="http://www.afterstep.org/"
 distfiles="https://github.com/sashavasko/${pkgname}-devel/archive/${version}.tar.gz"
 checksum=7a82d06a9ce432ef3b0856ff39f6da416aa8cbc249dbb2ff3c1cdcb02e2ca46d
 
+pre_configure() {
+	autoreconf -fi libAfterBase
+	autoreconf -fi libAfterImage
+}
+
 post_install() {
 	vlicense COPYRIGHT
 }
@@ -22,8 +27,10 @@ afterstep-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		vmove "usr/bin/*-config"
+		vmove "usr/bin/*-libs"
 		vmove usr/include
-		vmove usr/lib/*.a
+		vmove "usr/lib/*.a"
 		vmove usr/share/man/man3
 	}
 }

From 20cff3edfb5d4a904786b3ca0ac039f891c54f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 30 Jul 2020 13:14:42 +0200
Subject: [PATCH 145/298] icecat: update to 68.11.0

---
 srcpkgs/icecat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index bc4e855005d..2cdfa5dc264 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -1,6 +1,6 @@
 # Template file for 'icecat'
 pkgname=icecat
-version=68.10.0
+version=68.11.0
 revision=1
 build_helper="rust"
 hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
@@ -18,7 +18,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnu.org/software/${pkgname}/"
 distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}-gnu1.tar.xz"
-checksum=b4dfc9644d64c1effa8f7721956274d071b897d1893b57f8b7bd7b749955f834
+checksum=5d1728b7df2e7172b924367397093d4c4997ba21d390c21cd17b3a657ff30203
 lib32disabled=yes
 
 build_options="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver"

From 720f29e8f7f72fce843a471d60d86549652eb0bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 29 Jul 2020 00:20:29 +0200
Subject: [PATCH 146/298] nushell: update to 0.17.0.

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 45712b684f7..46289d69ba4 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,6 +1,6 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.16.0
+version=0.17.0
 revision=1
 # raw-cpuid does not support other archs
 # https://github.com/nushell/nushell/issues/485
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://www.nushell.sh/"
 changelog="https://www.nushell.sh/blog/"
 distfiles="https://static.crates.io/crates/nu/nu-${version}.crate"
-checksum=153d259d60d99efdc7b289469ab16a65444afe050348b91e45fb388eefb90521
+checksum=c3079e22ff97fbf802f32295f9d4a39c0e3b8f33c01ca050e070550ab8d32be5
 
 post_install() {
 	vlicense LICENSE

From 9a3dc594f6581f9fe2495970c6ce0da9c01e7a61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 30 Jul 2020 08:06:07 -0400
Subject: [PATCH 147/298] hplip: preserve SANE configuration

---
 srcpkgs/hplip/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 0ec65e7993a..962ca887837 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.6
-revision=1
+revision=2
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -47,8 +47,11 @@ do_install() {
 	sed -i Makefile -e "s;ppd/hpcups/\\*.ppd.gz;;g"
 	make locatedriverdir=/usr/libexec/hplip dat2drvdir=/usr/libexec/hplip \
 		rulesdir=/usr/lib/udev/rules.d DESTDIR=${DESTDIR} install
-	# remove config provided by sane and autostart of hp-daemon
-	rm -rf ${DESTDIR}/etc/{sane.d,xdg}
+	# Move sane config to dll.d to avoid conflicts
+	vmkdir etc/sane.d/dll.d
+	mv ${DESTDIR}/etc/sane.d/dll.conf ${DESTDIR}/etc/sane.d/dll.d/hplip
+	# remove autostart of hp-daemon
+	rm -rf ${DESTDIR}/etc/xdg
 	# remove unwanted files
 	rm -f ${DESTDIR}/usr/share/doc/hplip-${version}/{copyright,README_LIBJPG,COPYING}
 	# remove HAL .fdi file because HAL is no longer used

From 86fd3b0753fbaa2167c5b8c1afe3bbe22634de84 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 29 Jul 2020 19:35:28 -0700
Subject: [PATCH 148/298] CLion: update to 2020.2.

---
 srcpkgs/CLion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 46073f0c734..7dbadadf69f 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2020.1.3
+version=2020.2
 revision=1
 archs="i686 x86_64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=a95c27cf367f7b698b4bb1f5649f8399c29f4031bcf6b133336d0d75169f4b97
+checksum=b57aae3b6f0a40d36525cf4c61b9d772e02f87d7e8f43bf952282f4bb29900c9
 repository=nonfree
 restricted=yes
 nopie=yes

From e7f3a1150fd14dd3303b92d5e2b12c5051ed9242 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 30 Jul 2020 07:53:04 -0500
Subject: [PATCH 149/298] Amass: update to 3.8.2.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 6f15bef96b6..7d85c43dd61 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.8.1
+version=3.8.2
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=267ebad8b116464c9227892f0856ccd9545b005f1333871c5c875c9cdcf47afe
+checksum=7844fd5435bbedfa5bcea56b925d960bdbc1b82bcea1a2e8454f038b09686736

From 5eccc1e43e9d4d11f4dabb1ba1899edfc49338b5 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 28 Jul 2020 20:41:15 +0200
Subject: [PATCH 150/298] google-chrome: update to 84.0.4147.105

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 7a983c6524c..13f6885aecd 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=84.0.4147.89
+_chromeVersion=84.0.4147.105
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=9f8fd8f23a8402c45ef90668285dd37407ae13801fda652fb31a4f2ff47ef0c3
+checksum=dc7fa2ca2dccf482524dc2a343662859a22ad1fb33767447d7de6fcf6cc1dd7e
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From f6e1a2883e1ecfab99a846f5597ded0cf8577907 Mon Sep 17 00:00:00 2001
From: Daniel Santana <daniel@santana.tech>
Date: Mon, 27 Jul 2020 23:40:02 -0300
Subject: [PATCH 151/298] dunst: update to 1.5.0.

---
 srcpkgs/dunst/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index b6691955a89..ce1c91a5a53 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -1,6 +1,6 @@
 # Template file for 'dunst'
 pkgname=dunst
-version=1.4.1
+version=1.5.0
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -9,14 +9,15 @@ hostmakedepends="perl pkg-config"
 makedepends="gtk+-devel libXScrnSaver-devel libXinerama-devel libXrandr-devel
  libxdg-basedir-devel libnotify-devel"
 short_desc="Lightweight and customizable notification daemon"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel Santana <daniel@santana.tech>"
 license="BSD-3-Clause"
-#changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
 homepage="https://dunst-project.org"
+changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
 distfiles="https://github.com/dunst-project/dunst/archive/v${version}.tar.gz"
-checksum=1563fe8c9eaf3307a3d7dbed240521f79e8415f136497030512c69713118bdfe
+checksum=2c390adf144b5fa0ff007ea3616c90f1bb537df6a8042196993f5585d1bc8c9a
 
 post_install() {
 	vlicense LICENSE
+	vbin dunstctl
 	vbin dunstify
 }

From 9a2e4c25926f525e8e6a366bac2cfc73fc30253a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 30 Jul 2020 07:59:00 -0500
Subject: [PATCH 152/298] projectM: update to 3.1.7.

---
 srcpkgs/projectM/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index 9a3d2933b16..ca2b22afdd9 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,6 +1,6 @@
 # Template file for 'projectM'
 pkgname=projectM
-version=3.1.3
+version=3.1.7
 revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/libexec"
@@ -13,4 +13,9 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/projectM-visualizer/projectm"
 distfiles="${homepage}/releases/download/v${version}/projectM-${version}.tar.gz"
-checksum=6e5879fad747f05bab348a6b2af8fe2f73ad6a901f0dfaa544e9e1b6cefbadc0
+checksum=30af6d1c108efc19311a5636efbbedbe83d23905bb8472dd3fe4b07a21fb5fd3
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-fts-devel"
+	export LDFLAGS+=" -lfts"
+fi

From c6d510b52b7530978d20300b73aae2b02baea4b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 30 Jul 2020 11:05:25 -0400
Subject: [PATCH 153/298] hplip: ensure CUPS PPD directory cannot be deleted by
 XBPS

Fixes #20689. Until XBPS can track make_dirs and prevent their removal
when other packages are removed, this is accomplished by creating an
empty hidden file in the /usr/share/cups/model.
---
 srcpkgs/hplip/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 962ca887837..cc2920d69d1 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.6
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -19,8 +19,7 @@ configure_args="
  --enable-pp-build
  --with-mimedir=/usr/share/cups/mime"
 conf_files="/etc/hp/hplip.conf"
-make_dirs="/var/lib/hp 0755 root root
- /usr/share/cups/model 0755 root root"
+make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
 makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel"
@@ -47,9 +46,15 @@ do_install() {
 	sed -i Makefile -e "s;ppd/hpcups/\\*.ppd.gz;;g"
 	make locatedriverdir=/usr/libexec/hplip dat2drvdir=/usr/libexec/hplip \
 		rulesdir=/usr/lib/udev/rules.d DESTDIR=${DESTDIR} install
+
 	# Move sane config to dll.d to avoid conflicts
 	vmkdir etc/sane.d/dll.d
 	mv ${DESTDIR}/etc/sane.d/dll.conf ${DESTDIR}/etc/sane.d/dll.d/hplip
+
+	# This directory is a hard requirement, prevent its removal
+	vmkdir usr/share/cups/model
+	touch ${DESTDIR}/usr/share/cups/model/.hplip
+
 	# remove autostart of hp-daemon
 	rm -rf ${DESTDIR}/etc/xdg
 	# remove unwanted files
@@ -75,7 +80,8 @@ hplip-gui_package() {
 	depends="python3-gobject python3-dbus desktop-file-utils
 	 foomatic-db foomatic-db-engine python3-distro python3-PyQt5-dbus"
 	short_desc+=" (with GUI)"
-	conflicts="hplip"
+	conflicts="${sourcepkg}"
+	provides="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/hp-toolbox
 		vmove usr/share/applications

From d4520be43b117059d089b73d40449917aa9796bf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 30 Jul 2020 15:49:23 +0200
Subject: [PATCH 154/298] kodi: update to 18.8.

---
 srcpkgs/kodi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index adda1e753a4..94e05b15bf1 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=18.7.1
-revision=2
+version=18.8
+revision=1
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://www.kodi.tv"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
 python_version=2 #unverified
 patch_args="-Np1"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"

From f233de573a7ef548103722ca64003f6bc79d06b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 30 Jul 2020 20:01:07 +0200
Subject: [PATCH 155/298] thinkfan: update to 1.2.1.

---
 srcpkgs/thinkfan/template | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/thinkfan/template b/srcpkgs/thinkfan/template
index c76911ab0dd..0e9c5a6de5f 100644
--- a/srcpkgs/thinkfan/template
+++ b/srcpkgs/thinkfan/template
@@ -1,25 +1,23 @@
 # Template file for 'thinkfan'
 pkgname=thinkfan
-version=0.9.3
-revision=2
+version=1.2.1
+revision=1
 build_style=cmake
 configure_args="-DUSE_ATASMART:BOOL=ON"
-makedepends="libatasmart-devel"
+makedepends="libatasmart-devel yaml-cpp-devel"
 short_desc="Simple fan control program"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
-homepage="http://thinkfan.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b61c634996c450445d7e440bf41f7adcda86506063f832afa40d44e01061e45b
+homepage="https://github.com/vmatare/thinkfan"
+distfiles="https://github.com/vmatare/thinkfan/archive/${version}.tar.gz"
+checksum=a03fc0ed5bee33a1576c631e327fdd10f89fd906c5a413a8b01bd73d3fd97d25
 
-post_extract() {
-	sed -i '/time.h/i#include <sys/types.h>' src/globaldefs.h
-}
 do_install() {
 	vbin build/thinkfan
 	vman src/thinkfan.1
-	vsconf examples/thinkfan.conf.simple
-	vsconf examples/thinkfan.conf.complex
+	vman src/thinkfan.conf.5
+	vman src/thinkfan.conf.legacy.5
+	vsconf examples/thinkfan.yaml
 
 	vmkdir usr/lib/modprobe.d
 	vinstall ${FILESDIR}/thinkpad_acpi.conf 644 usr/lib/modprobe.d

From edaefa8c7c64ef753df13153f4bfff4bfecfb396 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 30 Jul 2020 20:05:05 +0200
Subject: [PATCH 156/298] open-iscsi: update to 2.1.2.

---
 srcpkgs/open-iscsi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b6e889996e5..79eafd23b79 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,7 +1,7 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
-version=2.1.1
-revision=2
+version=2.1.2
+revision=1
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.open-iscsi.com/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=dfc1ea37f230f9d116f5b39c795b35be43002d65c81330ccd3878786532b811b
+checksum=ba5125b5803aeac7de36b2cd777abc1b63d194983ede8b34fa82de8a5a1aa19c
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+="-D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;

From 71dcbbf725032839c560ea5f084da13423eac822 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 30 Jul 2020 14:28:38 -0400
Subject: [PATCH 157/298] python-protobuf: update to 3.12.4.

---
 srcpkgs/python-protobuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-protobuf/template b/srcpkgs/python-protobuf/template
index 92e6fa424c8..6f4e7415b5a 100644
--- a/srcpkgs/python-protobuf/template
+++ b/srcpkgs/python-protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'python-protobuf'
 pkgname=python-protobuf
-version=3.12.2
+version=3.12.4
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=49ef8ab4c27812a89a76fa894fe7a08f42f2147078392c0dee51d4a444ef6df5
+checksum=c99e5aea75b6f2b29c8d8da5bdc5f5ed8d9a5b4f15115c8316a3f0a850f94656
 
 post_install() {
 	sed -n 1,29p google/protobuf/__init__.py >LICENSE

From b6a72855b5b04485e6705ac1f5664ed0591236e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 30 Jul 2020 14:31:58 -0400
Subject: [PATCH 158/298] thinkfan: add pkg-config to hostmakedepends

---
 srcpkgs/thinkfan/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/thinkfan/template b/srcpkgs/thinkfan/template
index 0e9c5a6de5f..501631a371f 100644
--- a/srcpkgs/thinkfan/template
+++ b/srcpkgs/thinkfan/template
@@ -4,6 +4,7 @@ version=1.2.1
 revision=1
 build_style=cmake
 configure_args="-DUSE_ATASMART:BOOL=ON"
+hostmakedepends="pkg-config"
 makedepends="libatasmart-devel yaml-cpp-devel"
 short_desc="Simple fan control program"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 39cef19fa19448a84441b2a3af35bf383980e9fe Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 30 Jul 2020 20:59:05 +0200
Subject: [PATCH 159/298] linux5.4: update to 5.4.54.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 958a9ee142c..01ae2e2a613 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.53
+version=5.4.54
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=faa7b6f99220d5726f0eaee74a6394f0a3b89be1a75254f3804630211f3d6d21
+checksum=03e2a14e0eace8f4d668b72f82ad0a16f2221a676a22047aaac9ed0453dbf477
 python_version=3
 patch_args="-Np1"
 

From cf031a5b2f2286fa090ade2641be9c90657916cd Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 30 Jul 2020 21:00:54 +0200
Subject: [PATCH 160/298] linux4.19: update to 4.19.135.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index df2cd042e68..3a94c165ffd 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.134
+version=4.19.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=7d7da84f65d31546911283c36478b548bc78c4139061a7a0241feca8318e3a6f
+checksum=33d7cecaa6258233881d2a5ecf25d40134639da5b1d497222eb1cbed9e32af98
 python_version=2 #unverified
 patch_args="-Np1"
 

From 16d0bc98e25fe137c502cd2ad6743c14a5689b0a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 30 Jul 2020 14:51:24 -0400
Subject: [PATCH 161/298] python3-pandas: update to 1.1.0.

---
 srcpkgs/python3-pandas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 3e48f243ce6..5d66f6780e0 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.0.5
+version=1.1.0
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=f9aec4583b0338f18865576b1356182cb425bd7dd9d6faf918c6c4ab45d7fffe
+checksum=bce5b3f7898c4fc34ba6bd404c91d15a9cc37aebb0b9c8b4ed1a396f04680152
 
 post_install() {
 	vlicense LICENSE

From 8c14527d8f3a90a8ed53faa5633b20a58f21fcd0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jul 2020 16:50:14 -0400
Subject: [PATCH 162/298] dkms: update to 2.8.3.

According to https://github.com/dell/dkms/releases, this fixes the issue
https://github.com/dell/dkms/issues/127 that led to reverting 2.8.2.
---
 srcpkgs/dkms/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 32345b9b421..4365bc5a7d7 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,8 +1,7 @@
 # Template file for 'dkms'
 pkgname=dkms
-reverts="2.8.2_1"
-version=2.8.1
-revision=4
+version=2.8.3
+revision=1
 conf_files="/etc/dkms/framework.conf"
 depends="bash kmod gcc make coreutils linux-headers"
 short_desc="Dynamic Kernel Modules System"
@@ -10,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/dell/dkms"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=751e5dbc30a8cda26e379ff1940a80183145e77dab60914f160e037086177513
+checksum=0fcbb2691aa8231927b000edf3594d2798211c3944fd4a2a8b1864aa1c06eaaf
 
 if [ "$CROSS_BUILD" ]; then
 	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
@@ -24,6 +23,6 @@ do_install() {
 	vinstall dkms.bash-completion 644 usr/share/bash-completion/completions dkms
 	vinstall dkms_framework.conf 644 etc/dkms framework.conf
 	# Kernel hooks.
-	vinstall ${FILESDIR}/kernel.d/dkms.postinst 750 etc/kernel.d/post-install 10-dkms
-	vinstall ${FILESDIR}/kernel.d/dkms.prerm 750 etc/kernel.d/pre-remove 10-dkms
+	vinstall ${FILESDIR}/kernel.d/dkms.postinst 754 etc/kernel.d/post-install 10-dkms
+	vinstall ${FILESDIR}/kernel.d/dkms.prerm 754 etc/kernel.d/pre-remove 10-dkms
 }

From 05abab5cfd7cab8790d2a9f6d22ee9201f2aa3c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 31 Jul 2020 11:30:50 +0200
Subject: [PATCH 163/298] plasma-wayland-protocols: update to 1.1.0.

---
 srcpkgs/plasma-wayland-protocols/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template
index 40245850283..12551706c0e 100644
--- a/srcpkgs/plasma-wayland-protocols/template
+++ b/srcpkgs/plasma-wayland-protocols/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-wayland-protocols'
 pkgname=plasma-wayland-protocols
-version=1.0
-revision=2
+version=1.1.0
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
 short_desc="Plasma Specific Protocols for Wayland"
@@ -9,7 +9,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/libraries/plasma-wayland-protocols"
 distfiles="${KDE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=69c0fac42ccecaa78388f54725de493cad7ac798d85802225013c3e1fb7ee62b
+checksum=d7bcf780b764f013613870ff2366486f052827857ca0bb79981c97b436601d31
 
 post_install() {
 	vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \

From e6e4fb52d55bd212986d1149ca0d044b37be1b90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 31 Jul 2020 11:31:56 +0200
Subject: [PATCH 164/298] kwayland-server: rebuild against
 plasma-wayland-protocols-1.1.0

---
 srcpkgs/kwayland-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 764ece378bf..8ada51e76fe 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,7 +1,7 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
 version=5.19.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools

From c79357aa895f658dee9d9f0e2f5eb8130ed07d4c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 31 Jul 2020 11:38:18 +0200
Subject: [PATCH 165/298] sbcl: update to 2.0.7.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 6d9feade948..2f58d4153f8 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.0.6
+version=2.0.7
 revision=1
 archs="i686 x86_64* armv7l aarch64"
 
@@ -13,7 +13,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=fd92d64c1d97cc4f42fe3dcad2b183bcb225d01cdba4461634926f2f70adddae
+checksum=f596eed82c50abdf48dee5aba0bc39f62d158be29d2e1306f2b0b804219c617c
 nocross=yes
 nopie=yes
 
@@ -21,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 0abe511b860ed2a26e61a50c50e0fc50f0060b72a26441cbb344801b8621d34e"
+	checksum+=" 14d7722ac1849919667527c71ce216dfbeb348891efaac850711481b1c72239b"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From 436f37ac7524eb4d90bccbfa49e10e09d38d731a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 31 Jul 2020 11:38:55 +0200
Subject: [PATCH 166/298] python3-boto3: update to 1.14.32.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 0d6a20c38ed..21e54fe2b90 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.14.20
+version=1.14.32
 revision=1
 archs=noarch
 wrksrc="boto3-${version}"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=d1b8bbbe7ae876a81560319c1482fb18e4dc35ca1133345c7126bd092ece83ad
+checksum=a17cb68e76d8d7a38cc7e11c8abb44352f89142e2120c7ee0b4cfca100dd7d98
 
 post_install() {
 	vlicense LICENSE

From 5631198a93822507cefd371b17e8438770c651da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 31 Jul 2020 11:50:01 +0200
Subject: [PATCH 167/298] plasma-wayland-protocols: update to 1.1.1.

---
 srcpkgs/plasma-wayland-protocols/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template
index 12551706c0e..2d9d9300ccc 100644
--- a/srcpkgs/plasma-wayland-protocols/template
+++ b/srcpkgs/plasma-wayland-protocols/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-wayland-protocols'
 pkgname=plasma-wayland-protocols
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
@@ -8,8 +8,8 @@ short_desc="Plasma Specific Protocols for Wayland"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/libraries/plasma-wayland-protocols"
-distfiles="${KDE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=d7bcf780b764f013613870ff2366486f052827857ca0bb79981c97b436601d31
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=c5493383d115171c3435ea9a21b3966860632a844544ffac8f54890436a51d38
 
 post_install() {
 	vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \

From 51a2704f80013d15cf0dbf44a15406313c413634 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 31 Jul 2020 11:50:18 +0200
Subject: [PATCH 168/298] kwayland-server: rebuild against
 plasma-wayland-protocols-1.1.0

---
 srcpkgs/kwayland-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 8ada51e76fe..18c7ae3cc1a 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,7 +1,7 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
 version=5.19.4
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools

From c5d1ceda6a0469e52cca7e83f6c940e92748a766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 30 Jul 2020 22:53:29 +0200
Subject: [PATCH 169/298] exiftool: update to 12.03.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index f08b5529749..c9e96e31d59 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.02
+version=12.03
 revision=1
 archs=noarch
 wrksrc="Image-ExifTool-${version}"
@@ -14,4 +14,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=182c74ea3ec1113097f062a2ceb70f2555e3afb85ee7b7a4b7ec9db848915192
+checksum=85257cebd04394610f29a7d4aaa9bcb57a73d58a03c15baab2c2224aeb14207b

From 8b846620c6e4b49b100ebb2ab5417e5ef1214db4 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 29 Jul 2020 23:49:04 -0700
Subject: [PATCH 170/298] gtk-layer-shell: update to 0.2.0.

---
 srcpkgs/gtk-layer-shell/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtk-layer-shell/template b/srcpkgs/gtk-layer-shell/template
index 7e0b8abb368..88b42fd7453 100644
--- a/srcpkgs/gtk-layer-shell/template
+++ b/srcpkgs/gtk-layer-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk-layer-shell'
 pkgname=gtk-layer-shell
-version=0.1.0
+version=0.2.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,13 +8,13 @@ hostmakedepends="gobject-introspection pkg-config wayland-devel"
 makedepends="gtk+3-devel wayland-devel"
 short_desc="Library to create panels and other desktop components for Wayland"
 maintainer="travankor <travankor@tuta.io>"
-license="MIT"
+license="LGPL-3.0-or-later, MIT"
 homepage="https://github.com/wmww/gtk-layer-shell"
 distfiles="https://github.com/wmww/gtk-layer-shell/archive/v${version}.tar.gz"
-checksum=f7569e27ae30b1a94c3ad6c955cf56240d6bc272b760d9d266ce2ccdb94a5cf0
+checksum=6934376b5296d079fca2c1ba6b222ec91db6bf3667142340ee2bdebfb4b69116
 
 post_install() {
-	vlicense COPYING
+	vlicense LICENSE_MIT.txt
 }
 
 gtk-layer-shell-devel_package() {

From 7c52b48907d135a06a4d7be876bfaf1cf90f6210 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 29 Jul 2020 17:41:59 +0200
Subject: [PATCH 171/298] fcft: update to 2.2.3.

No need for any revbumps, this release is ABI compatible.
---
 srcpkgs/fcft/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 2cb74392aec..05ed1f7a314 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -10,14 +10,11 @@ short_desc="Simple library for font loading and glyph rasterization"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
-distfiles="${homepage}/archive/${version}.tar.gz
- ${homepage}/raw/branch/master/LICENSE"
-checksum="9bc54b5ccb637f6c8270697c886e3e86cb4ffb6042b1d4a32eaaee854fb0837d
- d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a"
-skip_extraction=LICENSE
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=be6b44a84f798c15a4e903dd7579b7468b79c8928c73f4c29dd4d1b6e94bb4e2
 
 post_install() {
-	vlicense ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE
+	vlicense LICENSE
 }
 
 fcft-devel_package() {
@@ -27,6 +24,10 @@ fcft-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/doc
 		vmove usr/share/man/man3
+
+		# The license is already installed by the base package
+		rm ${PKGDESTDIR}/usr/share/doc/${sourcepkg}/LICENSE
 	}
 }

From ba4d652ea10b8065447b2decf0f2b3a221a97e60 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 29 Jul 2020 10:21:39 +0200
Subject: [PATCH 172/298] github-cli: update to 0.11.1.

---
 srcpkgs/github-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c01c2323172..266656885b8 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=0.11.0
+version=0.11.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=e2137491f269df179ded7066f641ae7879a40870be53170a0388310e904158b0
+checksum=5ec8bab6a2c6f26cabc2a6b5f301d8971f9f654a85c6da5e7203e5e2d94cbec0
 
 pre_build() {
 	local _date

From c9956f9e684fcb90050649f35849d4c3767ced58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 29 Jul 2020 00:18:19 +0200
Subject: [PATCH 173/298] dua-cli: update to 2.10.2.

---
 srcpkgs/dua-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index a8d52ff254a..779653858a7 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.10.0
+version=2.10.2
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/Byron/dua-cli"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=efdc7dbaaa39ffb87deefe6bd6f7d771311488e1900f2ec2350187bd9588e3c7
+checksum=9622221cfe9d1420307a6ff03dc8a2fac26cf07e961c86ea88582e66576c0a13
 
 post_install() {
 	vlicense LICENSE

From 82aadd8721d6ef684b0a86d68ad8da336ed8f2de Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 27 Jul 2020 22:07:52 +0400
Subject: [PATCH 174/298] libutempter: update to 1.2.1.

---
 .../libutempter-remove-glibc-assumption.patch | 81 -------------------
 srcpkgs/libutempter/template                  | 10 +--
 2 files changed, 5 insertions(+), 86 deletions(-)
 delete mode 100644 srcpkgs/libutempter/patches/libutempter-remove-glibc-assumption.patch

diff --git a/srcpkgs/libutempter/patches/libutempter-remove-glibc-assumption.patch b/srcpkgs/libutempter/patches/libutempter-remove-glibc-assumption.patch
deleted file mode 100644
index bc9a46e7be3..00000000000
--- a/srcpkgs/libutempter/patches/libutempter-remove-glibc-assumption.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur utempter.c.orig utempter.c
---- utempter.c.orig  2010-11-04 13:14:53.000000000 -0400
-+++ utempter.c    2014-06-20 16:37:09.762403323 -0400
-@@ -34,13 +34,7 @@
- #include <sys/stat.h>
- #include <utmp.h>
-
--#ifdef __GLIBC__
- # include <pty.h>
--#elif defined(__FreeBSD__)
--# include <libutil.h>
--#else
--# error Unsupported platform
--#endif /* __GLIBC__ || __FreeBSD__ */
-
- #define    DEV_PREFIX  "/dev/"
- #define    DEV_PREFIX_LEN  (sizeof(DEV_PREFIX)-1)
-@@ -106,17 +100,12 @@
-
- static int
- write_uwtmp_record(const char *user, const char *term, const char *host,
--#ifdef __GLIBC__
-           pid_t pid,
--#endif
-           int add)
- {
-    struct utmp ut;
-    struct timeval tv;
--
--#ifdef __GLIBC__
-    size_t offset;
--#endif
-
-    memset(&ut, 0, sizeof(ut));
-
-@@ -128,8 +117,6 @@
-    if (host)
-        strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-
--#ifdef __GLIBC__
--
-    offset = (strlen(term) <= sizeof(ut.ut_id)) ? 0 :
-            strlen(term) - sizeof(ut.ut_id);
-    strncpy(ut.ut_id, term + offset, sizeof(ut.ut_id));
-@@ -156,27 +143,6 @@
-
-    (void) updwtmp(_PATH_WTMP, &ut);
-
--#elif defined(__FreeBSD__)
--
--   ut.ut_time = tv.tv_sec;
--
--   if (add)
--   {
--       login(&ut);
--   } else
--   {
--       if (logout(term) != 1)
--       {
--#ifdef UTEMPTER_DEBUG
--           fprintf(stderr, "utempter: logout: %s\n",
--               strerror(errno));
--#endif
--           exit(EXIT_FAILURE);
--       }
--   }
--
--#endif /* __GLIBC__ || __FreeBSD__ */
--
- #ifdef UTEMPTER_DEBUG
-    fprintf(stderr,
-        "utempter: DEBUG: utmp/wtmp record %s for terminal '%s'\n",
-@@ -255,8 +221,6 @@
-    validate_device(device);
-
-    return write_uwtmp_record(pw->pw_name, device + DEV_PREFIX_LEN, host,
--#ifdef __GLIBC__
-                  pid,
--#endif
-                  add);
- }
diff --git a/srcpkgs/libutempter/template b/srcpkgs/libutempter/template
index 2a26b0dd115..619ea27222f 100644
--- a/srcpkgs/libutempter/template
+++ b/srcpkgs/libutempter/template
@@ -1,14 +1,14 @@
 # Template file for 'libutempter'
 pkgname=libutempter
-version=1.1.6
-revision=5
+version=1.2.1
+revision=1
 build_style=gnu-makefile
 short_desc="Library interface to record user sessions in utmp/wtmp files"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://freecode.com/projects/libutempter"
-distfiles="http://ftp.altlinux.org/pub/people/ldv/utempter/${pkgname}-${version}.tar.bz2"
-checksum=b898565f31ced7e5c1fa0a2eaa0f6ff0ed862b5fe375d26375b64bfbdfeac397
+distfiles="http://ftp.altlinux.org/pub/people/ldv/utempter/${pkgname}-${version}.tar.gz"
+checksum=967fef372f391de501843ad87570c6cf5dabd9651f00f1783090fbc12b2a34cb
 
 libutempter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 184633b4f78d86f4e88a9c07566fd4e9d5e4b45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 28 Jul 2020 02:14:54 -0300
Subject: [PATCH 175/298] arduino-cli: update to 0.11.0.

This version added command line completions that must be generated at
build time.
---
 srcpkgs/arduino-cli/template | 22 ++++++++++++++++++----
 srcpkgs/arduino-cli/update   |  1 -
 2 files changed, 18 insertions(+), 5 deletions(-)
 delete mode 100644 srcpkgs/arduino-cli/update

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d35a00ee78c..fc67ce96a5b 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,17 +1,31 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
-version=0.10.0
-revision=2
+version=0.11.0
+revision=1
+build_helper=qemu
 build_style=go
 go_import_path=github.com/arduino/arduino-cli
 short_desc="Arduino command line interface"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/arduino/arduino-cli"
-distfiles="https://github.com/arduino/arduino-cli/archive/${version}.tar.gz"
-checksum=165347f8eb7d34c669ef3cee42bede9faffd5f0bb7ae0ece16c806a6230e8790
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=5a9b7eec55c3ee7f54d8804fac00ceb78ad0697fd918f6fbae0bb61cb33d8b3e
 
 case "$XBPS_TARGET_MACHINE" in
 	# the downloaded toolchains use glibc, this allows them to work on musl
 	*-musl) depends+=" gcompat" ;;
 esac
+
+post_build() {
+	arduino_cli=$(find $GOPATH/bin -name arduino-cli)
+	vtargetrun $arduino_cli completion bash > arduino.bash
+	vtargetrun $arduino_cli completion fish > arduino.fish
+	vtargetrun $arduino_cli completion zsh > arduino.zsh
+}
+
+post_install() {
+	vcompletion arduino.bash bash
+	vcompletion arduino.fish fish
+	vcompletion arduino.zsh zsh
+}
diff --git a/srcpkgs/arduino-cli/update b/srcpkgs/arduino-cli/update
deleted file mode 100644
index 7f12d0915a2..00000000000
--- a/srcpkgs/arduino-cli/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="/archive/\K[\d.]+(?=)"

From 76eaf96987dff2e724e8656eb4b70be752a70f66 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Mon, 27 Jul 2020 07:17:50 +0200
Subject: [PATCH 176/298] python3-plotly: update to 4.9.0

---
 srcpkgs/python3-plotly/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template
index 9c4b556a768..9cefb0a2702 100644
--- a/srcpkgs/python3-plotly/template
+++ b/srcpkgs/python3-plotly/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-plotly'
 pkgname=python3-plotly
-version=4.8.1
+version=4.9.0
 revision=1
 archs=noarch
 wrksrc="plotly-${version}"
@@ -13,7 +13,7 @@ maintainer="pulux <pulux@pf4sh.de>"
 license="MIT"
 homepage="https://plot.ly/python/"
 distfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz"
-checksum=d3fea527fe3dfdd55d7334318f107b05a8407474a0fffe6cd4726c9b99e624f1
+checksum=257f530ffd73754bd008454826905657b329053364597479bb9774437a396837
 conf_files="etc/jupyter/nbconfig/notebook.d/plotlywidget.json"
 
 do_check() {

From 77e9a6a8780c9b85e3037647d9235c99f2b7b2d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 31 Jul 2020 15:57:51 +0200
Subject: [PATCH 177/298] ark: fix CVE-2020-16116

---
 ...92524fed305d6fbe74ddf8a196bc9ffdb92f.patch | 46 +++++++++++++++++++
 ...fed305d6fbe74ddf8a196bc9ffdb92f.patch.args |  1 +
 srcpkgs/ark/template                          |  2 +-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/ark/patches/0df592524fed305d6fbe74ddf8a196bc9ffdb92f.patch
 create mode 100644 srcpkgs/ark/patches/0df592524fed305d6fbe74ddf8a196bc9ffdb92f.patch.args

diff --git a/srcpkgs/ark/patches/0df592524fed305d6fbe74ddf8a196bc9ffdb92f.patch b/srcpkgs/ark/patches/0df592524fed305d6fbe74ddf8a196bc9ffdb92f.patch
new file mode 100644
index 00000000000..79129c7be6e
--- /dev/null
+++ b/srcpkgs/ark/patches/0df592524fed305d6fbe74ddf8a196bc9ffdb92f.patch
@@ -0,0 +1,46 @@
+From 0df592524fed305d6fbe74ddf8a196bc9ffdb92f Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio <elvis.angelaccio@kde.org>
+Date: Wed, 29 Jul 2020 23:45:30 +0200
+Subject: [PATCH] Fix vulnerability to path traversal attacks
+
+Ark was vulnerable to directory traversal attacks because of
+missing validation of file paths in the archive.
+
+More details about this attack are available at:
+https://github.com/snyk/zip-slip-vulnerability
+
+Job::onEntry() is the only place where we can safely check the path of
+every entry in the archive. There shouldn't be a valid reason
+to have a "../" in an archive path, so we can just play safe and abort
+the LoadJob if we detect such an entry. This makes impossibile to
+extract this kind of malicious archives and perform the attack.
+
+Thanks to Albert Astals Cid for suggesting to use QDir::cleanPath()
+so that we can still allow loading of legitimate archives that
+contain "../" in their paths but still resolve inside the extraction folder.
+---
+ kerfuffle/jobs.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/kerfuffle/jobs.cpp b/kerfuffle/jobs.cpp
+index fdaa48695..f73b56f86 100644
+--- a/kerfuffle/jobs.cpp
++++ b/kerfuffle/jobs.cpp
+@@ -180,6 +180,14 @@ void Job::onError(const QString & message, const QString & details)
+ 
+ void Job::onEntry(Archive::Entry *entry)
+ {
++    const QString entryFullPath = entry->fullPath();
++    if (QDir::cleanPath(entryFullPath).contains(QLatin1String("../"))) {
++        qCWarning(ARK) << "Possibly malicious archive. Detected entry that could lead to a directory traversal attack:" << entryFullPath;
++        onError(i18n("Could not load the archive because it contains ill-formed entries and might be a malicious archive."), QString());
++        onFinished(false);
++        return;
++    }
++
+     emit newEntry(entry);
+ }
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/ark/patches/0df592524fed305d6fbe74ddf8a196bc9ffdb92f.patch.args b/srcpkgs/ark/patches/0df592524fed305d6fbe74ddf8a196bc9ffdb92f.patch.args
new file mode 100644
index 00000000000..2eba1cb3c5c
--- /dev/null
+++ b/srcpkgs/ark/patches/0df592524fed305d6fbe74ddf8a196bc9ffdb92f.patch.args
@@ -0,0 +1 @@
+-Np1
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index deb9b23a3c4..ab2766bbb86 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,7 +1,7 @@
 # Template file for 'ark'
 pkgname=ark
 version=20.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake
  kdoctools kconfig gettext pkg-config"

From 289d3543400d64d87375bd6fd4d336607fed9155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 27 Jul 2020 11:25:25 -0300
Subject: [PATCH 178/298] browsh: add Go modules patch, simplify build.

Also revbumping due to package not being in repos.
---
 srcpkgs/browsh/patches/modules.patch | 251 +++++++++++++++++++++++++++
 srcpkgs/browsh/template              |  34 ++--
 2 files changed, 261 insertions(+), 24 deletions(-)
 create mode 100644 srcpkgs/browsh/patches/modules.patch

diff --git a/srcpkgs/browsh/patches/modules.patch b/srcpkgs/browsh/patches/modules.patch
new file mode 100644
index 00000000000..8eb89a51c82
--- /dev/null
+++ b/srcpkgs/browsh/patches/modules.patch
@@ -0,0 +1,251 @@
+Patch from: https://github.com/browsh-org/browsh/commit/84f5382eda69e206c49bfaa777b3c1445f3a3a96
+
+diff --git interfacer/cmd/browsh/main.go b/interfacer/cmd/browsh/main.go
+new file mode 100644
+index 0000000..c6693f4
+--- /dev/null
++++ interfacer/cmd/browsh/main.go
+@@ -0,0 +1,7 @@
++package main
++
++import "github.com/browsh-org/browsh/interfacer/src/browsh"
++
++func main() {
++	browsh.MainEntry()
++}
+diff --git interfacer/go.mod b/interfacer/go.mod
+new file mode 100644
+index 0000000..0c92241
+--- /dev/null
++++ interfacer/go.mod
+@@ -0,0 +1,34 @@
++module github.com/browsh-org/browsh/interfacer
++
++go 1.14
++
++require (
++	github.com/NYTimes/gziphandler v1.1.1
++	github.com/fsnotify/fsnotify v1.4.7
++	github.com/gdamore/encoding v1.0.0
++	github.com/gdamore/tcell v1.1.2
++	github.com/go-errors/errors v1.0.1
++	github.com/gorilla/websocket v1.4.0
++	github.com/hashicorp/hcl v1.0.0
++	github.com/hpcloud/tail v1.0.0
++	github.com/lucasb-eyer/go-colorful v1.0.2
++	github.com/magiconair/properties v1.8.1
++	github.com/mattn/go-runewidth v0.0.4
++	github.com/mitchellh/mapstructure v1.1.2
++	github.com/onsi/ginkgo v1.8.0
++	github.com/onsi/gomega v1.5.0
++	github.com/pelletier/go-toml v1.4.0
++	github.com/pkg/errors v0.8.1
++	github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0
++	github.com/spf13/afero v1.2.2
++	github.com/spf13/cast v1.3.0
++	github.com/spf13/jwalterweatherman v1.1.0
++	github.com/spf13/pflag v1.0.3
++	github.com/spf13/viper v1.4.0
++	github.com/ulule/limiter v2.2.2+incompatible
++	golang.org/x/net v0.0.0-20190607181551-461777fb6f67
++	golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae
++	golang.org/x/text v0.3.2
++	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
++	gopkg.in/yaml.v2 v2.2.2
++)
+diff --git interfacer/go.sum b/interfacer/go.sum
+new file mode 100644
+index 0000000..b1fe86f
+--- /dev/null
++++ interfacer/go.sum
+@@ -0,0 +1,176 @@
++cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
++github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
++github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
++github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
++github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
++github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
++github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
++github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
++github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
++github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
++github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
++github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
++github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
++github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
++github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
++github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
++github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
++github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
++github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
++github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
++github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
++github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
++github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
++github.com/gdamore/tcell v1.1.2 h1:Afe8cU6SECC06UmvaJ55Jr3Eh0tz/ywLjqWYqjGZp3s=
++github.com/gdamore/tcell v1.1.2/go.mod h1:h3kq4HO9l2On+V9ed8w8ewqQEmGCSSHOgQ+2h8uzurE=
++github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
++github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
++github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
++github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
++github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
++github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
++github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
++github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
++github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
++github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
++github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
++github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
++github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
++github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
++github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
++github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
++github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
++github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
++github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
++github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
++github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
++github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
++github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
++github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
++github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
++github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
++github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
++github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
++github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
++github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
++github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
++github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
++github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
++github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
++github.com/lucasb-eyer/go-colorful v1.0.2 h1:mCMFu6PgSozg9tDNMMK3g18oJBX7oYGrC09mS6CXfO4=
++github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
++github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
++github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
++github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
++github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
++github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
++github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
++github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
++github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
++github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
++github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
++github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
++github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
++github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
++github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
++github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
++github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
++github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg=
++github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
++github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
++github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
++github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
++github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
++github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
++github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
++github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
++github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
++github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
++github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
++github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
++github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
++github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
++github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 h1:Xuk8ma/ibJ1fOy4Ee11vHhUFHQNpHhrBneOCNHVXS5w=
++github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0/go.mod h1:7AwjWCpdPhkSmNAgUv5C7EJ4AbmjEB3r047r3DXWu3Y=
++github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
++github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
++github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
++github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
++github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
++github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
++github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
++github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
++github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
++github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
++github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
++github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
++github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
++github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
++github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
++github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
++github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
++github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
++github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
++github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
++github.com/ulule/limiter v2.2.2+incompatible h1:1lk9jesmps1ziYHHb4doL7l5hFkYYYA3T8dkNyw7ffY=
++github.com/ulule/limiter v2.2.2+incompatible/go.mod h1:VJx/ZNGmClQDS5F6EmsGqK8j3jz1qJYZ6D9+MdAD+kw=
++github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
++github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
++go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
++go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
++go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
++go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
++golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
++golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
++golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
++golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
++golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
++golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
++golang.org/x/net v0.0.0-20190607181551-461777fb6f67 h1:rJJxsykSlULwd2P2+pg/rtnwN2FrWp4IuCxOSyS0V00=
++golang.org/x/net v0.0.0-20190607181551-461777fb6f67/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
++golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
++golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae h1:xiXzMMEQdQcric9hXtr1QU98MHunKK7OTtsoU6bYWs4=
++golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
++golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
++golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
++golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
++golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
++golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
++golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
++google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
++google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
++google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
++google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
++gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
++gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
++gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
++gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
++gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
++gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
++gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
++gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
++gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+diff --git interfacer/src/main.go b/interfacer/src/main.go
+deleted file mode 100644
+index 08e2bf5..0000000
+--- interfacer/src/main.go
++++ /dev/null
+@@ -1,7 +0,0 @@
+-package main
+-
+-import "browsh/interfacer/src/browsh"
+-
+-func main() {
+-	browsh.MainEntry()
+-}
+ 
diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template
index 7f6cbaaddca..856fefd13d7 100644
--- a/srcpkgs/browsh/template
+++ b/srcpkgs/browsh/template
@@ -1,42 +1,28 @@
 # Template file for 'browsh'
 pkgname=browsh
 version=1.6.4
-revision=1
+revision=2
+build_wrksrc=interfacer
 build_style=go
 go_import_path="github.com/browsh-org/browsh"
-go_package="$go_import_path/interfacer/src"
-hostmakedepends="curl dep go-bindata"
+go_package=./cmd/browsh
+hostmakedepends="go-bindata"
 depends="firefox"
 short_desc="Fully-modern text-based browser, rendering to TTY and browsers"
 maintainer="zhengqunkoo <root@zhengqunkoo.com>"
 license="LGPL-2.1-only"
 homepage="https://www.brow.sh/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz
- https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi>browsh.xpi"
+ https://$go_import_path/releases/download/v${version}/browsh-${version}-an.fx.xpi>browsh.xpi"
 checksum="965ce2d94d1d9e4b92411d344421c0bea40994527cafd694c5a6e8e206681ede
  b410527a69dba88a30d8a6d341a20eb5cb1f84b684e9bc8bb6bc88a2930e0eea"
 skip_extraction="browsh.xpi"
 
-# Manipulate paths, because nested dir of repo is a go package
 pre_build() {
-	INTERFACER_ROOT="$GOSRCPATH/interfacer"
-	cd $INTERFACER_ROOT
-
-	dep ensure
-	# main.go expects browsh/interfacer/src/browsh in GOPATH/src
-	cd $GOPATH
-	ln -nfs "$GOSRCPATH" src/browsh
-
-	xpi_file="$XBPS_SRCDISTDIR/$pkgname-$version/browsh.xpi"
-	destination=$INTERFACER_ROOT/src/browsh/webextension.go
+	_prefix="$XBPS_SRCDISTDIR/$pkgname-$version"
 	go-bindata \
-		-prefix "$XBPS_SRCDISTDIR/$pkgname-$version" \
-		-pkg browsh \
-		-o ${destination} \
-		${xpi_file}
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/bin/{src,browsh}
-	vlicense LICENSE
+		-prefix "$_prefix" \
+		-pkg ${pkgname} \
+		-o "src/browsh/webextension.go" \
+		"$_prefix/browsh.xpi"
 }

From cc0dd860832207c93d4e94b9865e3460516f82fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 31 Jul 2020 12:26:57 -0400
Subject: [PATCH 179/298] python-pyzmq: update to 19.0.2.

---
 srcpkgs/python-pyzmq/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-pyzmq/template b/srcpkgs/python-pyzmq/template
index 77e64710b29..f08dd14690e 100644
--- a/srcpkgs/python-pyzmq/template
+++ b/srcpkgs/python-pyzmq/template
@@ -1,11 +1,10 @@
 # Template file for 'python-pyzmq'
 pkgname=python-pyzmq
-version=19.0.0
+version=19.0.2
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python-module
 make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"
-pycompile_module="zmq"
 hostmakedepends="pkg-config python-devel python3-devel python-Cython
  python3-Cython zeromq-devel"
 makedepends="${hostmakedepends/pkg-config/}"
@@ -14,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 distfiles="https://github.com/zeromq/pyzmq/archive/v${version}.tar.gz"
-checksum=d197fc01dc67372066143e5e85dcd3a97ec759ceb76927b7de83cda05eb06006
+checksum=ed67b5ffe8a87c88c5a19bf6f2d64ca7e3c325a2f6cc30f989f5f57d2205bada
 
 pre_build() {
 	cat > setup.cfg <<-EOF
@@ -28,7 +27,6 @@ post_install() {
 }
 
 python3-pyzmq_package() {
-	pycompile_module="zmq"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From 074acc170fd02a75fec7bdcbc585f82939e3d93c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 31 Jul 2020 12:40:47 -0400
Subject: [PATCH 180/298] python-Pillow: remove python3 subpackage

---
 srcpkgs/python-Pillow/template | 21 ++++++---------------
 srcpkgs/python-Pillow/update   |  1 +
 srcpkgs/python3-Pillow         |  1 -
 3 files changed, 7 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/python-Pillow/update
 delete mode 120000 srcpkgs/python3-Pillow

diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template
index d8436a1eeed..1e36fc16e19 100644
--- a/srcpkgs/python-Pillow/template
+++ b/srcpkgs/python-Pillow/template
@@ -1,14 +1,14 @@
 # Template file for 'python-Pillow'
 pkgname=python-Pillow
 version=6.2.2
-revision=1
+revision=2
 wrksrc="Pillow-${version}"
-build_style=python-module
-pycompile_module="PIL"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel libjpeg-turbo-devel libopenjpeg2-devel
+build_style=python2-module
+hostmakedepends="python-setuptools"
+makedepends="python-devel libjpeg-turbo-devel libopenjpeg2-devel
  tiff-devel freetype-devel lcms2-devel libwebp-devel libimagequant-devel"
-short_desc="Python Imaging Library (PIL) fork (Python2)"
+depends="python"
+short_desc="Python Imaging Library (PIL) fork for Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="custom:PIL"
 homepage="https://python-pillow.org/"
@@ -19,12 +19,3 @@ checksum=db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950
 post_install() {
 	vlicense LICENSE
 }
-
-python3-Pillow_package() {
-	pycompile_module="PIL"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python-Pillow/update b/srcpkgs/python-Pillow/update
new file mode 100644
index 00000000000..37e09b1a872
--- /dev/null
+++ b/srcpkgs/python-Pillow/update
@@ -0,0 +1 @@
+pattern="Pillow-\K6\.[0-9.]+(?=.tar.gz)"
diff --git a/srcpkgs/python3-Pillow b/srcpkgs/python3-Pillow
deleted file mode 120000
index bafc9b1001d..00000000000
--- a/srcpkgs/python3-Pillow
+++ /dev/null
@@ -1 +0,0 @@
-python-Pillow
\ No newline at end of file

From c056ee8a3e520223f37b44f1c20724319a887971 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 31 Jul 2020 12:40:53 -0400
Subject: [PATCH 181/298] New package: python3-Pillow-7.2.0

---
 srcpkgs/python3-Pillow/template | 21 +++++++++++++++++++++
 srcpkgs/python3-Pillow/update   |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/python3-Pillow/template
 create mode 100644 srcpkgs/python3-Pillow/update

diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template
new file mode 100644
index 00000000000..f40ce622952
--- /dev/null
+++ b/srcpkgs/python3-Pillow/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-Pillow'
+pkgname=python3-Pillow
+version=7.2.0
+revision=1
+wrksrc="Pillow-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libjpeg-turbo-devel libopenjpeg2-devel
+ tiff-devel freetype-devel lcms2-devel libwebp-devel libimagequant-devel"
+depends="python3"
+short_desc="Python Imaging Library (PIL) for for Python3"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="custom:PIL"
+homepage="https://python-pillow.org"
+changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
+checksum=97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-Pillow/update b/srcpkgs/python3-Pillow/update
new file mode 100644
index 00000000000..8f71b3bbf30
--- /dev/null
+++ b/srcpkgs/python3-Pillow/update
@@ -0,0 +1 @@
+ignore="*rc[0-9]*"

From 36667e3b19f72997c5240947544e8951772b9a6a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 31 Jul 2020 20:15:55 +0200
Subject: [PATCH 182/298] mesa: enable drivers more liberally (AMD on ARM, etc)

---
 srcpkgs/mesa/template | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 7bfb661a15b..d757649e39d 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=20.1.4
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -41,29 +41,23 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 # swrast always present
 _gallium_drivers=" -Dgallium-drivers=swrast"
 _vulkan_drivers=" -Dvulkan-drivers="
-# legacy drivers only on x86 and ppc in general
+# pre-gallium drivers are mostly for old ati + i915/965
 _dri_drivers=" -Ddri-drivers="
 
-# amd drivers only on x86 and ppc
-# this also enables clover opencl
+# amd and nvidia drivers on all platforms except where it makes no sense
+# amd implicitly enables clover opencl, also enable hwdec and virgl too
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc*) _have_amd=yes ;;
-esac
-
-# hardware video decoding on x86, ppc, aarch64
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc*|aarch64*) _have_hwdec=yes ;;
-esac
-
-# most platforms get nvidia and virgl
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc*|armv[67]*|aarch64*)
+	armv5*|mips*) ;;
+	*)
 		_have_nv=yes
+		_have_amd=yes
+		_have_hwdec=yes
 		_have_virgl=yes
 		;;
 esac
 
 # x86 additionally gets intel, vmware and gallium nine
+# arm gets its own drivers (for mali, tegra etc.)
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*)
 		_have_intel=yes

From 830f22219065b3fd76fdfc5b18139ba69f8999c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 31 Jul 2020 21:24:46 +0200
Subject: [PATCH 183/298] kea: update to 1.7.10

---
 common/shlibs        | 16 ++++++++--------
 srcpkgs/kea/template |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fc85c709876..3f7b863c7c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,25 +2957,25 @@ libkj-async-0.7.0.so capnproto-0.7.0_1
 libkj-test-0.7.0.so capnproto-0.7.0_1
 libkj-0.7.0.so capnproto-0.7.0_1
 libkea-asiodns.so.1 libkea-1.7.0_1
-libkea-asiolink.so.6 libkea-1.7.1_1
+libkea-asiolink.so.7 libkea-1.7.10_1
 libkea-cc.so.8 libkea-1.6.0_1
 libkea-cfgclient.so.9 libkea-1.7.5_1
 libkea-cryptolink.so.5 libkea-1.7.0_1
-libkea-database.so.4 libkea-1.7.2_1
-libkea-dhcp++.so.17 libkea-1.7.8_1
+libkea-database.so.5 libkea-1.7.10_1
+libkea-dhcp++.so.18 libkea-1.7.8_1
 libkea-dhcp_ddns.so.2 libkea-1.7.0_1
-libkea-dhcpsrv.so.25 libkea-1.7.9_1
+libkea-dhcpsrv.so.26 libkea-1.7.10_1
 libkea-dns++.so.4 libkea-1.7.9_1
 libkea-eval.so.12 libkea-1.7.0_1
 libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.14 libkea-1.7.9_1
+libkea-hooks.so.15 libkea-1.7.10_1
 libkea-http.so.6 libkea-1.7.2_1
 libkea-log.so.6 libkea-1.7.9_1
 libkea-pgsql.so.1 libkea-1.7.9_1
-libkea-process.so.9 libkea-1.7.7_1
-libkea-stats.so.5 libkea-1.7.7_1
+libkea-process.so.10 libkea-1.7.10_1
+libkea-stats.so.6 libkea-1.7.10_1
 libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.14 libkea-1.7.9_1
+libkea-util.so.15 libkea-1.7.10_1
 libytnef.so.0 ytnef-1.8_1
 libpisock.so.9 pilot-link-0.12.5_1
 libpisync.so.1 pilot-link-0.12.5_1
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5b77e6b290a..b4f9841b769 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
-version=1.7.9
-revision=2
+version=1.7.10
+revision=1
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -20,7 +20,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0, Apache-2.0"
 homepage="https://kea.isc.org"
 distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz"
-checksum=3218b879b227771b8c1bf6da5a62a13327b05b98b16ab2c9b40897e9ce56d91d
+checksum=4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82
 
 build_options="botan mysql pgsql"
 desc_option_botan="With Botan SSL support"

From 12409fe7434514ead6a6d16fc0a3e10d436fb5e8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 31 Jul 2020 21:20:17 +0200
Subject: [PATCH 184/298] xf86-video-nouveau: drop archs=

---
 srcpkgs/xf86-video-nouveau/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template
index 81129aa30f4..dabd68e3ea5 100644
--- a/srcpkgs/xf86-video-nouveau/template
+++ b/srcpkgs/xf86-video-nouveau/template
@@ -2,7 +2,6 @@
 pkgname=xf86-video-nouveau
 version=1.0.16
 revision=2
-archs="i686* x86_64* ppc ppc-musl ppc64*"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel"

From a7ca628dae7e9323894cbfc5f6d720fbc69798d5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 31 Jul 2020 21:23:54 +0200
Subject: [PATCH 185/298] xorg-video-drivers: nouveau on aarch64, usual drivers
 on armv7

---
 srcpkgs/xorg-video-drivers/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/xorg-video-drivers/template b/srcpkgs/xorg-video-drivers/template
index cd1eba06efe..094b71591d0 100644
--- a/srcpkgs/xorg-video-drivers/template
+++ b/srcpkgs/xorg-video-drivers/template
@@ -1,13 +1,13 @@
 # Template file for 'xorg-video-drivers'
 pkgname=xorg-video-drivers
 version=7.6
-revision=21
+revision=22
 build_style=meta
 depends="xf86-video-fbdev xf86-video-dummy"
 short_desc="X.org video drivers meta-package"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
+license="CC0-1.0"
 homepage="http://www.voidlinux.org"
-license="Public domain"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*)
@@ -18,10 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 case "$XBPS_TARGET_MACHINE" in
-	# 32-bit ARM/MIPs vary too much, don't have defaults
-	arm*|mips*) ;;
-	aarch64*)
-		depends+=" xf86-video-ati xf86-video-amdgpu";;
+	armv[56]*|mips*) ;;
 	*)
 		depends+=" xf86-video-ati xf86-video-amdgpu"
 		depends+=" xf86-video-nouveau"

From c5db5ace539fe4ae707ce9ef1997b03c5edd5347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 31 Jul 2020 22:59:42 +0200
Subject: [PATCH 186/298] lollypop: update to 1.3.3

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 38e6eff55c9..39f9a778a41 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.3.2
+version=1.3.3
 revision=1
 archs=noarch
 build_style=meson
@@ -14,4 +14,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
-checksum=b75b5e8c8de31ec18e01e2cf9fa658676e6a3ad336265268514b16497dd65a66
+checksum=b80bc76a23cc0e43c2900ac46a12f3da1a674d01cf3c4144e7591efff65750b5

From 7512e7139e147b0bb60da737326479c710a9db73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 31 Jul 2020 23:15:11 +0200
Subject: [PATCH 187/298] quadrapassel: update to 3.36.04

---
 srcpkgs/quadrapassel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/quadrapassel/template b/srcpkgs/quadrapassel/template
index 69fd822dad2..94f203de714 100644
--- a/srcpkgs/quadrapassel/template
+++ b/srcpkgs/quadrapassel/template
@@ -1,6 +1,6 @@
 # Template file for 'quadrapassel'
 pkgname=quadrapassel
-version=3.36.02
+version=3.36.04
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Quadrapassel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bc65a6bf83094deb8792b656c95adde484e12d3ce35cf09f42ce67ee3bf0031
+checksum=57c3ead045ec37d39db81279d88cb483ce2ba191d0cc904b226d606ff4ad8013

From 55b9899503ffa78f4a4e9df513578f8cf88ae2ff Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Fri, 31 Jul 2020 16:45:00 +0100
Subject: [PATCH 188/298] firefox-esr-i18n: update to 68.11.0

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 6d0d3813775..6fdd22574cb 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=68.10.0
+version=68.11.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="3f2ba9320f4909c96e4dd622f5e514c64ff38f37396f6e1a564d30d5e594cfd7
- 356c4b03bdeb0755b0f4da33db5f69262f6a23f6b24bf73b8cfba2ad153f40bd
- 1aaca2b396708f610c4abbd8aa946f6ed801e2bf49c23378a23ac3eae035c50f
- f63759f8e33cc55d724cd8f168a27278cef0cc9f70eab06bef1b0c35a7f03931
- 97e425102826f5ce01742d777f9cd945ea0466dbad95ee672e155ced83b064b3
- 1cf70c87d35978c9bca9bcfee8554e2cfe29b187d30a096b0f1fce13bb1273ff
- ddb9721ee66f44feba0e8afd476321d21db0eace189c9768ff589f4242e3cd01
- a509f8e0715d484f7bbdcfb3b98558f6dd5ba3c5feade3e393abdd0f224fe8b5
- 4fd26ced6c3fd12d32e4606594c045fe3c1e9f3eeaef6ad3a8d145183ddfef92
- 66df49026e36b7978e8fb1dc1e717101caa58ddb2664dba582001309c3b828a2
- 909e817334bf0d2fa22e7a1cc658b681bf05cf7ee15f46be04b0f6628b994379
- 253d1380b7eb7e82788ae6af7f09f50cb04e2d3cfa8449918b68a0b8f080af78
- 1f77cbadc72be0fe86b17a6ae0b3b8e1e415a4999db435a026665f06b71d4fe2
- a430e741a5c05f18706cf7fbb90691129410728f04a94a6b3d419d8a8d705ffb
- fe20000b081d4c0497472ea2ba36a89492e1134e493ed25205f2c74d051205cc
- d4950b690f710fe3e61f09e6fbed8a9b52bfe483f099f7259ccd5ff1500f3908
- c0cd944eeade950be7d184bc5f5b5fc2e4967868166217a8682e9dc3cb52b9d1
- a7a24ec314b246670acf099309bf738e11851b01a37086f18da475005d87a73d
- 73510c25c860c0a6d2f90775183c8d0d84025f01f8e2fcfad1ff5f1cf09f89f4
- dcc0fee2d8769c1912efd601196e664229305c99178ca0305c19e09654bc4b41
- b615fa3a7a836dd2f0361c682f159e95b3b6053175645246a2ebe9833d179da7
- 3edb426d061ed1d9c7daababbb0426832a2c4e2a27bd56d9325b53b720c5fb99
- 7919ad02865a7640d624739ebe27c267b3844b107a72345d272bb55d935e822a
- 4e0ad13ebc3c602fb5317f32d1f5f057d628f719be62a6b406e3a38f681dc0f1
- bb8ee36f388a3259f0adc6c9900568680e1d378858d149636ed91d9cebe2676e
- cbcf2fafc7c9f3f99efa6602564c0167a6ed7e3db39287abf7a5179eb2978b22
- 7f6c184fb68ac38ba8612af4f2c78e7741c7dc906e67b217a342316e6763825c
- f46e7865dd4f4152e75256f65b6d96297c51b28a1fef79d41cbbe99227b30442
- a18aef681c207177fa2a884927a82c5a6924ed2943f1b3a9e4d3203d0165bd2b
- a3e75715ff8b60eb60b45bae45682658a65daa63d11af97d6b73e2e66bd17706
- ca6ada663a3664e17ccf8cba08ba9af19112d2381152684da23433a3fac74a69
- b82fe910d834349e6bc560be6d3ebf7e13de4e6e690fa444a440f28d3bb18a52
- b5762753bbc0f89ad3009eec6a08309d81cc860d068a8ed83c0ccdc4c56326ca
- 4c99c72790aad89a3d6551131b64ace67d15b4c406b6f082aca4a76c7abc05db
- 73cbb74363164636eca5255c6b326deb6016116b3e21e5cd3caa60cc9c260eb8
- 0f84e705fceb45b42637521bf1f8f5490eaac35b6fb699b59e3708e481f1a6df
- a8f6100c7011f34191281b9de62b1103c508a69974b80f8d26e1bedb593b4907
- 29e6268619f3f2a57d7d61e5777506fd256d9f766902375c074261c484771b64
- 1e66e975e73c77a029a2e4e4d7fa67f5c0c5fc0e720d4798762c5250dd3bf843
- 68e037e4c6db7b43342999acd9c4396d895aa95259300faeaf3e616e1f626bb8
- b4045ce9d42d518c47ca216f3bf4bcd630728d298ac92792b8e4b64173d69d43
- 1e45b89986fa2f0de6058190bf32468c31ae7c2891983f7d589b1d4e55c1536c
- 6fd771ed16594792d91e82d979bfd0975eff9dd6f5b18aca785f4d24c9e3b736
- e1bf8f800f8c5520cf5d982a6616d74737dd573c330ff3316d1f148ee7c7259b
- 541ad78f4c185666cc8fe3e9a3014aa9e89e8d36cc54a4e63891081dfd0fd300
- 50269984e3087c7df3709aa00a322c70245c56757263b0ea379a716ae3564440
- 1eeed1e21cbf59acb8f3fc707e5a6f2d603266f0f482954d26e0ef339f438d4e
- 13b5e2b3728a7b9ccef953918797457f74193661f45c1953bce4c297b57fe92e
- b5a291ab1c6e594a5d42616e4ef617d2c35fa21bfb68cf7b41131ac46373fb48
- cdbbf3a770f892bee345d2d09936ca2e372ede9a93eab241329959a0c91bffaa
- 56a00f95d0dc5b9773a2a4bdd3f1c4f313cc72a4f9beb339c11847076d7c93e5
- 67eb0beb2b86701e33e6ae36fc5ce2061a8aa5b25434651cbc948fcf31835eb4
- b7ed3771bde06bf04d2751f78eb44c1bd8b2d07a9a4c26474d447e5e20643bae
- c30f2b9f90aed0e5e08253849a4e1f8eacb851960d110cc6e607313eaf4e8cd7
- 2ade2e006c294c23e24f3dabec292eef8be284c8d398ea5b66a4eb4c28393623
- 8b5a0955701a4ff95bc219fc1e99a96cabb2cbea7948a72fa980590caa94a1b7
- 670086791fd6050c0835f749bd0da5909ab9e46826273ba059524d80cc15e8f4
- 5f7d526c9766df9c7514ee616d3f34907d1cfaba7fed4eac8df60ae7939c3b5c
- d857454bf9e3e7d2c1ac84605786d1bc88afd21c88950d6bd104547029cc0b79
- 5db2b576e2bab4134fb0dd85257452025783c4d868e055faa84919befdac3a71
- 4e014daed9cb91bef0d835e50af23e75dae6645f50aa0c1e5163231c60de84a0
- 97c26f0b795d9a357aae122864f6cac7d3977dcc81fcc951da74a31d601f1f41
- 2ad72e0a82c5a9ff204ae0501a26823f898f8fc403f904a27f23e2111e36ed7b
- cdfd6a44387f77359e5e5a9d3d0365e210014a37b5979d0268ff687099571dd1
- e52301792dc9b04a3a82e1599e05ab2a1a8424896fb6ab8289e5c5fdb4be7fe5
- 7c6bc07db83004c241c6ea355d4613fd7a2636d9012d273efa83fa4bb40dbd02
- b735b936df7d0d274d650dd5cb907cf00e545433b008a9be2b52f3cd426c7b6f
- 73fa0631d5b31187442666d1323fc4b615270e1249fec38b3e3e421c55601bd8
- dd2eef3d44d44ec05f2dc3d09f29ab7309d25714f9befd76b618c571a7501fa3
- 8cbce1cccb2f3b0523a5ccf3da917c244b278ba529dba1faca68c24de54de8b3
- c265077b6961023dd6ad0d1af8a2676d0cfe461253b725d90c58817b089031b6
- a63bddf7297f8ca0736d2667d6a855e5ef87cfec8be56e660a0d66468de8ebc2
- 40ebfc5349c18959f0c3d7ad8ca72b8f2dc855b4f6494614fcfdd6e3f8c95370
- 83d2f5231378ff3035c3ceb75ac2afca79ccbf522836816d96dda26d728ca294
- 1e0edbcec59180be6a71d2a413012a3dc9f7dcedafdaba1212db91268d3e558d
- 7145f8d3bf9db35a9cf7303925ce114db8c892c4aaa8a1f6b8faa522a73ce6a8
- 97bddf5e5d13a8a2e051b037ef109315f45560763546a91536a616e9b144b7bb
- db789005a81b655bb6110d2bfe4ae68e58d1da536ed23cd150021bbcd54e37a9
- acafb7f340a28d8c4e25978a7673a6d4c2d1e01c0cb607fcca100520fdf69e5a
- 676670bddd7a9d2e93b92e4e5b95f6987cf3666890ce462535b1f096e3be6044
- 281d9b0b8d357d7ea6f50b833ac130d52ecf9bcae46a7118a05c7826550320ea
- 0c703243bd81cdc11e1e65c19bfb2aa19a62f5040b101d04a922f8ce6c98852a
- 8a971c55300ea615b083eeb85c254b00a3b3c6a707c288ffb1e3a19de9f44e15
- 99f922ae3adf4a3d4b68e42e58e62ec9a2e6480cfb1bf57589541f7a128bbdca
- 06c1859289dfbc7da249f793fcac7587b91abe309f767627dbc6fbe7f004d4bc
- 01b62183ce512b1272894bdd10432bb4261593bba74c024643b3a14027ad3131
- 4a0eca11feee73b2027d8a7c14cc5f2b1b499230ec58609b543960a7f964d8d3
- c55342dc5303a79592c40aa4b2dae5a2ad69dae5b01f80c707a7280d0b7f520f
- 312f0ea8c1b21772cbd39128c8b51c40457eaf02cc055bb1f095071860d73d7c
- dee400420b646d142787678196fd04782fc4e355e576e71410118247df3065c0
- 7b70091975ebc64e3a7ea5d5aad2cf3be5388452df48a12ce6d8d41463c9f6fa
- f4905c7984db6fffce05da3c69938aaab5d1691fcea9755291a882725fb3ce8f
- 7c236ce3361e47cf0a6337cff008ed87114840b9681d9fca8e5e245ca631ac1b"
+checksum="a96b2eab357c1d3ae79978919d78227e91427464ec0d506276e8448df878e4de
+ 77b3f295c0c8e331deec5ac81c4566e70e686e1134569e3dc383406634148642
+ dddd186a5e1835778736cf1eb6254dc6909b0fc547b312695788cc455b52aa9e
+ a59a86cc1838461ee51c3235c617ee28bb0ae7a4422866b645f67a7a2bc77673
+ 52acf8999a4f46549ef251787681f8db62ee44a1653cd1eefb82b5c8a7e3c480
+ 02d42d95c95d4b83716d71dbc8f9eab6d046540be34bc65360f16deca54840e8
+ 458001594cf5402dae30241193ffcdf0f727bc0451b46382cd12939458459258
+ 87be7b1c87ad813430e9f587315f1371f21f655ecb7f6dd90380741597ee818b
+ 67f628587202ffef8744e2399fc2e808454562f6e68a607c4a0dadff38f68789
+ 27b99f0e05d79f39abbb1770190f4a3d049aa527bd02ce9dd6815a3f73e3757f
+ 4b30e8c01fc67bb11779fa50d8e1b2c93d6a2a936c6d8c77d3314df0cfccc131
+ 45ebc6437bcc217ac54b0bf380a2f3f2e6cbbeada8d74269a760ae0d7a3a47da
+ 139126e7e7f6c78e23da66dca5441fc9c0c53eca1009cf58377044fe6fdeb202
+ 92b1a9b9465237c6423aac78cd02110354f7a4d4f89e915e045e3cf224323c51
+ a0abce87643502f16e3a4dde825cf3e7f58cd75f5a4196451ede813b799611c3
+ 8faaf99245fa5fd7a8ffe0344a6892546735c19eb9f2c6ecc534fc5808e26aec
+ 9317185ea24b23004971de4187b2561d12c82872e4aa61f406bc02d5e83617fd
+ 6869b14cf69508cd2f34cc722b346f30db0ec3891ebcc31908f69a1f307c8d67
+ c153a54ec2e4ad4e817f8fa91d29a1698c11ca9ec04e494e1d866c7d9842ee8e
+ dfe8300b735d2141798f8255d3ec102699b5b127bf9cfe5860784220ca0b6055
+ fd57e1055a25fa1dcd5a91393408dad91bf0db2054c4bfd29ab47785f3156599
+ a9f17b51896142082b3bfdcdbca9a472d95c5dd12005f2c3ce346c938d57ce7f
+ 935826ae44cace20973c9ee32df8032fa95ab82843a92c514add0d8c44fb4c7e
+ 4579dd24069d6414eb105d58c1789605a0ada438504f4fc14c724a4ee78b3726
+ f69ec189d7eb2a4074a9218a9b87399f0504b8790e8aab98650120acc20ca184
+ 4164c7f23e13e86f6c3e3bb1319da47a51d8b35b13acd2e8bf1c371d6c8a6ec3
+ ffac444bc57d684f0f131f93ff48ddf4db3761905fa36882659a380eddaa1703
+ 017049781b08378ab45a8cc95efda95e8dc4d10dc86d26efaf8209c51c556a0a
+ 5b7851dca418b6cb08a3e6d4f189478de2fba5869d559f82740eec55abb45f93
+ ef8c1054b528afc780b916f87b5038c0d2baa02a4445f7ec18c11f316766533e
+ ee81934fbe482564a28f5e4cd44d3596b5f3a3926abf4e7c30c52918199299e1
+ 269f6ca41e1322939ec1ed68a919e84e990cd431d7dbfc2bb67d3708e8d89bd8
+ c29406cfb4d94e98e15ec5f0fe9f9cec52a6e251865683cca307ff562b52d0a7
+ 025c7ed2fec33d06eb3cca4b7255d8b133cccb5d943d38afceef93ffc494e9e1
+ ac70f1b3f164798e4c95dddb81e45ae91f40ad66b97cd443da94df68cc7b7964
+ b467e26b8facc706501ec93be8b23c4fbc16b1fd01678f968d591951b7dab19b
+ cf0b4e1f2c0620b19917e616ce1d94da9b4361e1e642c080fe36580911d61b18
+ fd18f16b746c48224e4721d2a118fad44c598ca851778331aed4bd4355d8e982
+ 064fe64bde1cd1bf2c255297af730ef0487fb193d5ca425935fc26e6e46c6733
+ 06396fbfaebba29ffded9c79942e7fe6d988d1e0e26ac6bb3082dc5c1bfd1370
+ ac2d5b18284b3702a3b93e09c73dabc42894088bf7bd3ecd9e1114c882ad88be
+ 8f96e6b7e4be985ca90e5a378cb90a87cdef5b0ef36a64e86aac042e6f4dce74
+ ca38f1b8c8198150986e35264d6c8a0f56c2e4b694738d926104d360d1244c1e
+ bdb3756655fb54f5fb3feca19dce0bb6a7a98293f0def9f8855dbd269d20a259
+ f531eee42bb19c32ea1242beb29147e064da58caeede025510d8b3092198c62b
+ 05df51330571877fd1ab339183e6d68a5c92c5a132e109464b75dd5d4879d969
+ 8492216768d7c008a224d5831b47bf0ef6a7ac19ce21b0113ecce921868654ca
+ adea068ac99f58030551f1a080bd70d946c20edd9000c554f46289f3ea75c4bb
+ 0d909de2c7320827eab604e697ad3bd89adfd55c9e8ea5aabc2e3938f45025bc
+ 6edbe0259392b489ff808174e107d01dcaaf42b862ee3d0b804cfbda1ff636d3
+ 4fc4c48637a0d285e85db0d699a62a08c6cc503073b4201b6115c13f9c7283dd
+ e6fe631141ce94e6425e4c745fe2b5a2cbda685c5492ebb3c614d09433c455b8
+ 6f0730299dd9fd362c6b994128bce064bf215fd27f55a673fda6569bbf38a4c4
+ bb2e2cc0a0e4047b67b28596685b228c69c85a6a65d37c2c1003d7a9d8fd378a
+ 8640f7eaa4aa157ce94c951d9eecfaffd0d603bc05ce95559d90042302c99803
+ 2641ca0efcde0c92cc2ad4ad6c65fbe3ab56b711d88f26fd4e78c18cd3138aa2
+ 34cf05b4d96261da6e972bd64bba273de11b24b3032de1bdf1777d69d968b114
+ 0fb47c0ac1aec79351af5e06782c2ba1afd26cf8cc37505858e4028261affdf0
+ c4926c88b3466385c6040378e0fe9f777536f540e01b01f3d70ee514ff3593a6
+ b6edc8d2a7f9ea08ad89d05560351d5dd90f1bdc73c5ca7f6fc6e2cd6902bcd3
+ 5f25b4cc7443a6e8b30a4ffd8233920b2b8e4d1a6adca465739d7badd80f1534
+ 81248e707ced39e1bab3d28c9735dbe15ab7e8a9b563e887a65c6e995045bf17
+ 5fcabf089b74c00a4864dd77191fdbc8c5c35a7b748c96834961d2e2c1d2b15b
+ ea07bc5f78c771e803b00844a49d7f6e45abb6624a106d921d7a0d4bcc8ed886
+ 3c30cfbb658332f44a397e91da7aefbab02adb34bdc534386f6acb47e5eb5c18
+ ea4f2864fa6624a43cc04ad8222256a12b6c2aef877ac811f8c2f64097439006
+ 0bcd2198157a72df46c6702cc1330b152555341eeb4f046f6e7cec63d0715802
+ 2eca90bf5c6f0c762fb1f52cfa7f0146fae69a85bd45080066b8ef3514dc24e5
+ 506ba2747f0eac45f42ee729ca5bbc41931630852f2288244233e98cd7c9a489
+ de98305ce3526749f4cac6ffd47861a3cad7f2cbf25180471c68cf3280776edf
+ 4a8de2a062d67875dec79748e4cb03a3881e378108ede064d5aab10145afd2a2
+ c638de4dc72b87dab2e315b2da71d7612762c4d483d75d2feaa655e24db64241
+ 090918108985a1ab3ee8e155c97e6ef4ab7b7b2613f4be3388bfb4758be4e503
+ 4153ffb1c211c3c45a0efa9700c0908544f90d6a848f5096120933bfd94c44c3
+ 96d86350fd693bf708e4f4f7de238e71e0b90bcdac3205a3a25c84b13500bd99
+ ae4a76c6644585df1777d46ef10dbcbdb35dee0a13a45622bd49ad7b5eb996ac
+ ecb6a93d321be76717245b6a651b96123ec1765f133779caf8a43b38827aa892
+ 51932dccdd95a740fafdb2873f56c3306d803db5a796fd8379d986d84fd128a2
+ 8162375363e6f1650230bc643e2bde1d0018b4f6cf54369e0c59967ad5fa4a97
+ 72c79a7c65a637cb918e999d7d7ee13f4736e646512d165371740862e1e943b1
+ 558887a62a2b09636c5c5f8e7ed99b018344af190ebdf1a6d71548cda11d032e
+ b39046f78509d308072b384511725776d9de7da667f12bc6508eb6c39f843c75
+ 9038e9e671846f1839fa3b4794f121e546ce544021848f933c239b9917a16c2d
+ e238909d4f9ab35a0f1f56cd85747b307626f9713c3899d6497b3e1f257f28cb
+ 220793d97e399aca5d5e82bf159eb12b7acb6d974fcd693d45c7c264e85e6548
+ ef3f9f02f67084fc4dc4bde464002502a176cb7361813815c5460dd94ae0656d
+ 7baede2ac4e391b60896a0a02242aeabfe55ce8b50e7b05d5b77d99dda6b76e1
+ 5dec1a1452fc2303c655f153c19d675ef200f448be4b0c2b2b2d50244c820b41
+ 88ed2511992f45b930922fd4bba5e5ececc761029e3d92cd092d5ed5f66a3030
+ fcd8e1dea4a1c33fd72b096a61712f74a269ab334bf93653b265ee9e2871d999
+ 4ec2d6697632bc8dfd294b668d514deb37efde5414881dccbb9a280fa9f86ef4
+ 6c9aea7e23d20cb9074dc4acf8936cf249eb5b6e2c5ba1e4eab27267b41822a4
+ 5c0f5c8cc336e73a98dd6b22bc11c418e2ab33bc95ac5b7c948ea4eba1f1a7e3"

From dc63dc35a69eef19171e60496e05f24fbc53d26b Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Fri, 31 Jul 2020 16:45:41 +0100
Subject: [PATCH 189/298] firefox-esr: update to 68.11.0 [ci skip]

---
 srcpkgs/firefox-esr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 5bc255f7de5..eb3c32bed59 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=68.10.0
+version=68.11.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=2ec8c2627e46e80fc208584966a2ded7a0a9ff76b55ffccec0623b89b98ded2b
+checksum=91c1f7caaf1ba785b74799865227456bf784ba614d17cf5f0f41a5f25d6d2160
 
 lib32disabled=yes
 hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm

From 7af27b2ba9fae0396fc28d11fae90c42e84c7edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 31 Jul 2020 00:42:21 +0100
Subject: [PATCH 190/298] New package: batsignal-1.1.2

Close #23963
---
 srcpkgs/batsignal/patches/cflags.patch | 14 ++++++++++++++
 srcpkgs/batsignal/template             | 18 ++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/batsignal/patches/cflags.patch
 create mode 100644 srcpkgs/batsignal/template

diff --git a/srcpkgs/batsignal/patches/cflags.patch b/srcpkgs/batsignal/patches/cflags.patch
new file mode 100644
index 00000000000..4bf91c2bb28
--- /dev/null
+++ b/srcpkgs/batsignal/patches/cflags.patch
@@ -0,0 +1,14 @@
+--- Makefile	2020-07-31 18:42:11.268427773 +0100
++++ Makefile	2020-07-31 19:30:33.904122987 +0100
+@@ -7,9 +7,9 @@
+ PREFIX = /usr/local
+ MANPREFIX = $(PREFIX)/share/man
+ 
+-CC = cc
++CC ?= cc
+ LD = ld
+-CFLAGS = -std=c99 -pedantic -Wall -Wextra -Werror -Wno-unused-parameter -Os -s -D_GNU_SOURCE $(shell pkg-config --cflags libnotify)
++CFLAGS += -std=c99 -D_GNU_SOURCE $(shell pkg-config --cflags libnotify)
+ LDLIBS = $(shell pkg-config --libs libnotify)
+ 
+ SRC = main.c version.h
diff --git a/srcpkgs/batsignal/template b/srcpkgs/batsignal/template
new file mode 100644
index 00000000000..72775d9640a
--- /dev/null
+++ b/srcpkgs/batsignal/template
@@ -0,0 +1,18 @@
+# Template file for 'batsignal'
+pkgname=batsignal
+version=1.1.2
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="pkg-config"
+makedepends="libnotify-devel"
+short_desc="Simple battery monitor"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="ISC"
+homepage="https://github.com/electrickite/batsignal"
+distfiles="https://github.com/electrickite/batsignal/archive/${version}.tar.gz"
+checksum=00cb30df33b5fee049963657f341e963a0f094dbf1620397bf1e56fa07191e7c
+
+post_install() {
+	vlicense LICENSE
+}

From c922eaf549bc785e16eeea2f41dcefd2a383fcde Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 1 Aug 2020 05:06:28 +0200
Subject: [PATCH 191/298] llvm10: fix host triplet being wrong in cross builds

LLVM_HOST_TRIPLE is the triplet that llvm will be run on (build
is the build machine, host is the execution machine, target is
what it compiles for). This was not being set (only target was)
so it would default to the build machine.

This would result in issues with e.g. llvmpipe in mesa, which
would try to use the host triple to generate for, and subsequently
fail.

While at it, make sure not to clutter builddir when lldb is
unavailable.

Fixes https://github.com/void-linux/void-packages/issues/13896
---
 srcpkgs/llvm10/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/llvm10/template b/srcpkgs/llvm10/template
index 902ca3f5050..62c75d00061 100644
--- a/srcpkgs/llvm10/template
+++ b/srcpkgs/llvm10/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm10'
 pkgname=llvm10
 version=10.0.0
-revision=3
+revision=4
 wrksrc="llvm-${version}.src"
 build_style=cmake
 configure_args="
@@ -103,8 +103,12 @@ post_patch() {
 		mv ${XBPS_BUILDDIR}/lld-${version}.src ${wrksrc}/tools/lld
 	fi
 	# Move lldb files into the llvm source.
-	if [ "$_lldb_enable" = "yes" -a -d ${XBPS_BUILDDIR}/lldb-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/lldb-${version}.src ${wrksrc}/tools/lldb
+	if [ -d ${XBPS_BUILDDIR}/lldb-${version}.src ]; then
+		if [ "$_lldb_enable" = "yes" ]; then
+			mv ${XBPS_BUILDDIR}/lldb-${version}.src ${wrksrc}/tools/lldb
+		else
+			rm -rf ${XBPS_BUILDDIR}/lldb-${version}.src
+		fi
 	fi
 	# Move compiler-rt files into the llvm source.
 	if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version}.src ]; then
@@ -156,6 +160,7 @@ pre_configure() {
 		ppc*) _arch="PowerPC";;
 	esac
 	configure_args+=" -DLLVM_TARGET_ARCH=${_arch}"
+	configure_args+=" -DLLVM_HOST_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
 	configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
 }
 

From 4c487a4a9c49ef6c00bfd319ea9cfd175800c157 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 1 Aug 2020 09:48:36 +0200
Subject: [PATCH 192/298] thunderbird: update to 68.11.0.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 7c1b361f7ca..7d57aec6929 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=68.10.0
+version=68.11.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=700ca2e21fef8f76134fc18d901fe890180c21a988ab39ad651554a8ed08a01d
+checksum=0d2f403c7aca55ab130b7262ff8afc0254e5c0471db01f1631976df68a6af5f2
 
 lib32disabled=yes
 

From c8bb92cf15b81ebdd27cde2387442f6a3091abf3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 1 Aug 2020 09:48:38 +0200
Subject: [PATCH 193/298] thunderbird-i18n: update to 68.11.0.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index c50c08a36fb..fd9c9580559 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=68.10.0
+version=68.11.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="709f70baf3c40898eb756532d30fe1349644c9506246fb165e0671931441b9db
- 6afab3506d837a333013d4f91fdddb34fa965e315c51f94963e13497beb0f986
- c4bce091be5319bcd1e9778be4e2d1ead606641ff13c32a38286c8060d2b8c19
- 5ed49402525f50f4ca65e2efcb86a579e1ae1f9cf46df7c6383007be355cfc1e
- 85d72d143cdf253245b9c541976ea537f2fb2491bdf98dfca7f0e54f45cc2ebd
- 7fb19aa6a3553dd10dd2aa9b9e63cc2cab5cf437f3ffc6de340bd0bcc62b40d7
- 7353abfe8d887c9409fa67da63ee37beb30b4878ca45b202d00cc8a71619c5b1
- 7de84cf98ad09ac18d88e38633f40aee82d9f8baabf22c889c92a2f1e4c6bedb
- 908e2c54110553377d35747cf7aa6820233157fa13a9ec159e92e7924dd83282
- ee2f839709a94ff54d15943bff24a9e8a6f040534859e7db0af5be01ed4cee26
- 4f32e4925e0c63ba996be7cd506460225757d0dfc59623fc72d69f3a0012a516
- 06847dc045c3384b0501f0ebc4edb13da44097d3656a7c51ce8984b5f800b49e
- b59f067fd285f3b1b327f29cfbda759e8ed99b9ce8cce028c32e5f27cd53425b
- d0856747e23cc6bf0938430730ecc5490be15f0a1cbe573fdc757c86c1d23e17
- 0b0fab697f75fc2748befb8a8856f3c79529cf7f1f769a1b1b8b74d58f050594
- 714f4112b30383bb1e3389b42b1da8fc47ad2bba53eacd40ecafd71a27e81745
- d0fcf8d65df1feec06897747caf6e250634ae1a973e1c3ed281758b82367e8eb
- cab7cf42d2e374bb16c46d6987d2a17465b0e06e2ec23201d023cbc4e00d1f8e
- a77f7fa009e11666c31193a0a4ea8910aee89ef3b10226152b23c086130ffc5d
- e378810b13548baceeebced1ee60af37cd7999491b12819403a768de376c8c98
- c00c9f5e8566f61c2f9f02fc5cb3ba338f9782a10a74515a13a34f9b75d8f0d8
- 9fe0dd389902362b343b34ac973d05c9716a330b495084bbad408586f37affa6
- bac3abd761b4ffcda0fcc9abb8cf8f975db4106f96c5fee440963c9e86dc6dae
- 9608caf3deba64e07c1f0e8978ee39863d7d6de91e22ee90b4b3ee49c5f28892
- e26e504ddfeb29b9536b8d191db6d9839ad52cf1a72b2789236ddac5af654766
- f01bed8dd40d38fb316d7918125027662341d8b0e4f566037b41c16f67696905
- 58b7d8b7348b66892cbf8f8277deb48bdcdb287e42188fd0295e22316d20c27d
- cc79d0bbccfbe73ac86bcf0565302def6bd80fb6e9ae3e051d99d50d8866e6a0
- b1d1789ef68af1df8eae432f65dc63c5121782832383b9242fb0ef9d307fbeed
- b4eef48fa4074e39d8f6b9da3709d18965eb6448f2245f27a8463746bfd0bd13
- 3bafbe37de82de4f51bd55d89d7d4fd49923644fa77a113de1bb9f71b300c782
- ba4672d3f6470892fcd02e8b1e75d67028a66872ba69ba373ec6481aded01f5d
- 795d1fc525a91f406ab304c25adce32f8749b1c994a215e910c5d777cc3f4e26
- e7fbc84f967d74fc67033582452ded49182759fbb9d414420fc8ed78930aad33
- 322db1e4f4d54fcf43e965ab664afb4f2a530811443a1a5d6bcfa6b25cc137b4
- ad272efe203ccab630f18c5611082f3f5b7b816ea7ff30e0113e520a3abc6cee
- 421b4573d77378d5e6b84dd66e2bac8cc73caf5c5c208e9beea636d7885b7277
- c337892d41955e7f7e31cbc8e4566cbd1905d657073044a09eba41fb071733bb
- 71e3262f0e8374c367ad1e8defabc6375d342a6bedbe162456a175e8dc4bec45
- 476629477ff1118177de3e91286fcc85476d6bb5056b39721a324a5c259f1928
- 34feff2bbd6c38d2d33268b2ac8cf5d16fdf99df03d61e476b31ffafda7c2519
- c15cef46ba00298fdfd71811a49df4841a3fd8441651839e00024c45c03633be
- de6574c879312c80a466cd146f803118f781c81c366ebddef2c4782f47e876ff
- d8b5b044934a2fcd4914b388b933ee0c7f9085b828a702f010f6aea360dedc89
- a8855c24ebd0b2dd5ff34ac5d50efce72f0cd5fd022ae507bcaac518e13acff4
- b5c22a80f34b2b9014f1b453767c69ff7d42a2fe072cc3a7cb69590e2be544f7
- 048ed53d45c7fe7327f74c1fcede709354570ba7649ee361232dc7b9762eff26
- 874e3fea9b45f350167f7b792d6c3c2c7ebdfec89e243a284556c3f46616ade0
- 772fa4e8c8863e77f7b371ce271d3a092566f82cda9cec84f87e58a6e1377479
- 4e1c67e09c148ee9044bd7ab0776f634cdbd6c8db753d702bd0dbe3defe947af
- d3511f5f5c4a070c0550ec64d1b0e07a214406f48e2529b6068a7347e3547904
- d5d383e4b0213e77ff41249753a39d8c8b31023c37c25e4b594ed09ba9d003f8
- 295b114543d0d1b198a0ce1aa856f9aeb7b031b3bedf68de5c121b8f5cdeeb38
- db5ca4999c8f6b2a9f58520c40bb0950ee5a153cea9f3ff02b2b8b0fbcf0fc12
- 1476e612f96c9d40c26896b8785355cc6ea40744024e50f31c6a1bd1bea10b87"
+checksum="29ebac8c1596b508a1a19977524bcb9b9d357b8b422274c03f085bc2a1e5d11b
+ b36fc2bc7ee070202ec3caa6ffe3bc24f527d8c076e33f0f3ac7c2bb34678264
+ c425d737792ab8a4793e4c9ac094027c9ecfabe5bdc56c205e1b57b999626fd2
+ 344962eb54d66b925d1e9d2139e92bec9d3f7c273d2735ab4933004efb2cc300
+ ff8f1460b1c3dec628985fb047c62d75847a8ab1fdef553324dcd1b1c7a058e5
+ bd531fa67ef6b4406e778cb5b0e09dc38e6de2f08d48c2fe87bfb13ba62eebac
+ 9690c8600e36c138954bc2848d71872346c1e747b97a2bc180783779af589c15
+ 52afdc19898b244a0a751ec5e89f223922554931c6a5cfb46289b3f71e7e4700
+ 47c6881a303ade66dca9618b5127557be7511e1d44a64892efecefd451b7f7e0
+ 77d63f3133a1978d139098af5d2e2cc19675c1bf380a7f2dac2d59ce876c29ee
+ 046e46ecee6430a190f0f8cfdcc4723f5d69f617d1167788ebcd410fd6c206e5
+ afa61ad764739ea2f171e8c3338883b2b076e354a40c39d73709d5592f3ad577
+ 7cfabfb6454de77116b7ca806ca43cf1c93b21b126708e787f7e0d2e3b1907af
+ 7d38732aef00b03c54f353cd81f5b22fb43437f0b0960ae269c0af58832e7044
+ 9690287d26cd6d3fd8301f762a40d4304ef7dbf0f73da913a793eb5f171295af
+ c9eafbbdf6a267804dbfb2f5f8d6f1a1b53aa0fa9426f9af05138655a49d61f6
+ c5d249574dc53a8425bef3469d2bf6aa3e1735a9cef1cfe5339a7c4b674294a1
+ 6a6bcdddbf4cf6edae30b7d5eba330232d88fc2722085409ecbac0861f661d05
+ ac2abdbd3cad39a5d52626ffe00e7f59ab52c669b3da6f43268d62e2f01345d7
+ 566718f0068fccedacf3cee3ab56a36e849bc3d4acadf508962c81981f29e7e9
+ bb94fb6835400bfe0b70276fc45e941b4a5dd809f946865dfca841373beb42f7
+ 9b36cc8688ab7871ef90f7778b3747fc6503a56ed42f8faafa0b6568e9a906d0
+ b99159527690293830cf167affa9a604c26a10e268d0617a3d06e7319ff8572a
+ 22695eda8f34c749e95a310752461d48f45eafb428dbf6a1d324e223577fae0d
+ f35d72064fd5a7246020e5958d8d43b0f0e1f439aee7095e306318400bd4b298
+ e015951a49b812ae1889e24dd67f67cc26c38242a0c20708ef845277559b131d
+ 343acef6937334a0a525fd181f88c7f68f75e93cdeacffef05df4a8211e288b7
+ c9e3739e55834d7512e5817498c358498a3cb0f652f21c213c06287204ebed01
+ 2381df9b757dd2aac778001a09f36d88e98f2620dd05813425f53b9e35f26040
+ a6f21d925b9334d5f46e054ae6db492f7c3c8c62b043a292e45a984a37ef6087
+ ced2a3d7a590e538ca6d817efda47478ca198246640835733c5d579205fd9059
+ c2bff27ecd581fffb156cb9fdfc26cdfa2a2fd8dab3ad478c80ca53d22c59ef6
+ efc4f0b1781463bdf0561e25e9c31dc5878949cbd34684393f168b7b69f88e15
+ c4fac0f3281e59de3a1a43767ac497689605d6e35673e3606b5a43fb835cd47a
+ fc034024f5a960d3ac82b5b5b99dc481b8d6508496bd6264dd873c4883a9440e
+ c3c5fe21cb5bb84af9b6428ff6f62ba8b669dc931ea3bd66225bd3d88aec07f8
+ bb5955b070dd509f4a8f170162826ec497d0a09e56eaa641e8223328b67408a3
+ a0d018d37b19fa4e82d89411c9e297df12fa56b003f6631cfbc12355dd8cac94
+ d8a5eac605c4288f1946de393dd52b9c16f8f618335c1e609806b5ec806d697a
+ 867cd73998fca97eeb29a08ae3b492329741bcfcd157c275e2f7c3d75dd2da7f
+ a56814cbc21b8415645c655ae20836935c3fba31d66c0b33de33ace295a294e3
+ 0dbbca82f751b0fe80ca7f3b161350d982e966499e0835c415cd7ed32861b3a7
+ 238f218891c28e1505bddbd08a183896b93d383d56e5a429a8ac731d30b54624
+ 2d7f404c97d377275a4e9be9fcf5712ba2b85c161042d80f992c4c1d794890f5
+ 3093d3e5de225238bb15c459c0b317c5ebf05302389d03cbd0b69768ca9c011d
+ 313247a18560313e0d39895713c793488e98c705659fc5b6aaba59fd25fbeb5c
+ 06542ba7fad18017e52b135ab68266a0c791a1446b36b55f4476e9e6720c33d0
+ abfeca306d10dcaba73becffa90bf830707983f341b8abfec90203297c2f676e
+ cb1e4c67fad60b0080ce304a78728174f463093a2a6d730b5bd6739b5a15c370
+ 93da2ce9ffa2aec8aa56fd88c97ee5bead6b8ba46b4df3bd98a4376402669183
+ d6144c43d24bff108ae787092bbbefe91c135345a923f7f8b951ac7cd46fa807
+ c2c24bfe1522a36181b6c6d03acf98a0df3921c0493cc8c818df70ebf2760c53
+ d68229f3b05b80ad807cd2a750b916e460665574c96b5b8e5258e2f689a4a971
+ 4ca52ff75e0358feb4a535617076d2aede70b0d7ab29524a4b4bfe4f1b7ab0da
+ ff20a2ac005ee398f2aec1897f578ed38072b7b21e3e962abc67ecb66d01d3fe"

From 508291247f2347ff13914f343c90d2b4ba6d2f09 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 1 Aug 2020 09:35:30 +0200
Subject: [PATCH 194/298] gtk3-nocsd: update to 3.0.3.

---
 srcpkgs/gtk3-nocsd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk3-nocsd/template b/srcpkgs/gtk3-nocsd/template
index e4defeec870..97a9497be23 100644
--- a/srcpkgs/gtk3-nocsd/template
+++ b/srcpkgs/gtk3-nocsd/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk3-nocsd'
 pkgname=gtk3-nocsd
-version=3.0.2
+version=3.0.3
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/ZaWertun/gtk3-nocsd"
 distfiles="https://github.com/ZaWertun/gtk3-nocsd/archive/v${version}.tar.gz"
-checksum=023a4a48aed521d5b2c2449ef4625d5277a6d529c450be0d429f0f13c1b6a74d
+checksum=92229ce9254dddfadc464c74a3188ee786b82c6c9606642ec3a865caaf4e3b70
 
 do_install() {
 	vbin gtk3-nocsd

From 7806dd2f266de4e6c89ccd915a5b9b3c55bc3928 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 1 Aug 2020 09:40:24 +0200
Subject: [PATCH 195/298] linux5.4: update to 5.4.55.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 01ae2e2a613..5259fa34751 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.54
+version=5.4.55
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=03e2a14e0eace8f4d668b72f82ad0a16f2221a676a22047aaac9ed0453dbf477
+checksum=cc0b3fd38e80efdac3d8501b7e4670912f5acf345e0f07c4822210c3de4bf940
 python_version=3
 patch_args="-Np1"
 

From 277fe502e595d172321de958a58b5e8f4b9065fb Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 1 Aug 2020 09:43:57 +0200
Subject: [PATCH 196/298] linux4.19: update to 4.19.136.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 3a94c165ffd..306ff8aa457 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.135
+version=4.19.136
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=33d7cecaa6258233881d2a5ecf25d40134639da5b1d497222eb1cbed9e32af98
+checksum=91f93b432db62a0e2c71b0764eb2b099027b2ba2f331f4fb982db2524dd6163e
 python_version=2 #unverified
 patch_args="-Np1"
 

From 2fe9c840816fd53edda22ebe3e8ace13329df2cc Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 1 Aug 2020 09:52:31 +0200
Subject: [PATCH 197/298] linux5.7: update to 5.7.12.

---
 srcpkgs/linux5.7/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.7/template b/srcpkgs/linux5.7/template
index 53070839f45..1b23ecb1731 100644
--- a/srcpkgs/linux5.7/template
+++ b/srcpkgs/linux5.7/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.7'
 pkgname=linux5.7
-version=5.7.11
+version=5.7.12
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=93293032aa13c3998eeb2afd910f11c0f2e8a76ffec46f74ce3fcfac53ed60f1
+checksum=7a54cf89d7198d99004495c0e3a25d3af05c5d5b70cccf92237f603d7fa15e08
 python_version=3
 patch_args="-Np1"
 

From a177bc2edd00ede3a1d6cd857a881a4fc6e92c2f Mon Sep 17 00:00:00 2001
From: aktsbot <box.ashishk@gmail.com>
Date: Thu, 30 Jul 2020 21:41:14 +0530
Subject: [PATCH 198/298] font-manjari: got versioned release urls for archive
 from upstream

previous version of the package used an unversioned link from upstream,
that had frequent updates, which would break sha256sum check.

Closes: #23959 [via git-merge-pr]
---
 srcpkgs/font-manjari/template | 12 ++++++++----
 srcpkgs/font-manjari/update   |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/font-manjari/update

diff --git a/srcpkgs/font-manjari/template b/srcpkgs/font-manjari/template
index 395dec5105a..459d5de5210 100644
--- a/srcpkgs/font-manjari/template
+++ b/srcpkgs/font-manjari/template
@@ -1,7 +1,7 @@
 # Template file for 'font-manjari'
 pkgname=font-manjari
 version=1.810
-revision=2
+revision=3
 archs="noarch"
 create_wrksrc=yes
 depends="font-util"
@@ -9,15 +9,19 @@ short_desc="Malayalam font with smooth curves"
 maintainer="Ashish Kurian Thomas <a@aktsbot.in>"
 license="OFL-1.1"
 homepage="https://smc.org.in/fonts/manjari"
-distfiles="https://smc.org.in/downloads//fonts/manjari/manjari.zip
+distfiles="https://releases.smc.org.in/fonts/manjari/Version${version}/manjari-Version${version}.tar.gz
  https://gitlab.com/smc/fonts/manjari/-/raw/Version${version}/LICENSE.txt"
-checksum="ade6ba3006c0cbd01d90084d9a5119a22db996a603bf82b68d94fdcfed750cf2
+checksum="d90ca754850a2084f8435f3a885c52f200b08a4da5018f9a8291093a2c70c162
  94e69dddcfc87af561cad830b6afeb0d858634ae8aa649f8381891873fd6f591"
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
-	for f in *.ttf; do
+	for f in ttf/*.ttf; do
 		vinstall $f 0644 usr/share/fonts/TTF
 	done
+
+	# install fontconfig file
+	vinstall 67-fonts-smc-manjari.conf 0644 etc/fonts/conf.avail/67-fonts-smc-manjari.conf
+
 	vlicense LICENSE.txt
 }
diff --git a/srcpkgs/font-manjari/update b/srcpkgs/font-manjari/update
new file mode 100644
index 00000000000..dc24e9edd38
--- /dev/null
+++ b/srcpkgs/font-manjari/update
@@ -0,0 +1,2 @@
+site="https://releases.smc.org.in/fonts/manjari/LATEST"
+pattern="manjari-Version\K[0-9.]+(?=.tar.gz)"

From 9153268d1109a6b347d77300664314875abc4970 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 8 Apr 2020 19:56:10 -0500
Subject: [PATCH 199/298] zeek: rename from bro, fix cross, update to 3.1.5

Thanks to @sgn for the cross compile fixes!
---
 common/shlibs                       |   8 +-
 srcpkgs/binpac                      |   2 +-
 srcpkgs/binpac-devel                |   2 +-
 srcpkgs/bro                         |   1 +
 srcpkgs/bro/patches/libressl.patch  | 176 ----------------------------
 srcpkgs/bro/patches/musl.patch      |  74 ------------
 srcpkgs/bro/template                |  49 --------
 srcpkgs/zeek-devel                  |   1 +
 srcpkgs/{bro => zeek}/files/bro/run |   0
 srcpkgs/zeek/files/zeek/run         |  10 ++
 srcpkgs/zeek/patches/fix-musl.patch |  37 ++++++
 srcpkgs/zeek/template               |  73 ++++++++++++
 12 files changed, 129 insertions(+), 304 deletions(-)
 create mode 120000 srcpkgs/bro
 delete mode 100644 srcpkgs/bro/patches/libressl.patch
 delete mode 100644 srcpkgs/bro/patches/musl.patch
 delete mode 100644 srcpkgs/bro/template
 create mode 120000 srcpkgs/zeek-devel
 rename srcpkgs/{bro => zeek}/files/bro/run (100%)
 create mode 100644 srcpkgs/zeek/files/zeek/run
 create mode 100644 srcpkgs/zeek/patches/fix-musl.patch
 create mode 100644 srcpkgs/zeek/template

diff --git a/common/shlibs b/common/shlibs
index 3f7b863c7c3..cc6c17a61a0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3627,9 +3627,11 @@ libtexpdf.so.0 libtexpdf-0.9.5_1
 libupstart.so.1 libupstart-1.13.3_1
 librtas.so.2 librtas-2.0.2_1
 librtasevent.so.2 librtas-2.0.2_1
-libbroker.so.0 bro-2.6.1_1
-libcaf_core.so.0.16.2 bro-2.6.1_1
-libcaf_openssl.so.0.16.2 bro-2.6.1_1
+libbroker.so.2 zeek-3.1.1_1
+libcaf_core.so.0.17.4 zeek-3.1.1_1
+libcaf_io.so.0.17.4 zeek-3.1.1_1
+libcaf_openssl.so.0.17.4 zeek-3.1.1_1
+libbinpac.so.0 zeek-3.1.1_1
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libuhd.so.3.15.0 uhd-3.15.0.0_1
diff --git a/srcpkgs/binpac b/srcpkgs/binpac
index 52815503047..bd825eaacdb 120000
--- a/srcpkgs/binpac
+++ b/srcpkgs/binpac
@@ -1 +1 @@
-bro
\ No newline at end of file
+zeek
\ No newline at end of file
diff --git a/srcpkgs/binpac-devel b/srcpkgs/binpac-devel
index 52815503047..bd825eaacdb 120000
--- a/srcpkgs/binpac-devel
+++ b/srcpkgs/binpac-devel
@@ -1 +1 @@
-bro
\ No newline at end of file
+zeek
\ No newline at end of file
diff --git a/srcpkgs/bro b/srcpkgs/bro
new file mode 120000
index 00000000000..bd825eaacdb
--- /dev/null
+++ b/srcpkgs/bro
@@ -0,0 +1 @@
+zeek
\ No newline at end of file
diff --git a/srcpkgs/bro/patches/libressl.patch b/srcpkgs/bro/patches/libressl.patch
deleted file mode 100644
index 31308629063..00000000000
--- a/srcpkgs/bro/patches/libressl.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From fc43d06955a255bce4162b459be4a6a3a11a178d Mon Sep 17 00:00:00 2001
-From: Jon Siwek <jsiwek@corelight.com>
-Date: Mon, 7 Jan 2019 11:35:17 -0600
-Subject: [PATCH] GH-227: Improve LibreSSL support
-
----
- src/file_analysis/analyzer/x509/OCSP.cc       | 16 ++++++++--------
- src/file_analysis/analyzer/x509/X509.cc       |  2 +-
- src/file_analysis/analyzer/x509/X509.h        | 11 ++++++++---
- src/file_analysis/analyzer/x509/functions.bif |  6 +++---
- 4 files changed, 20 insertions(+), 15 deletions(-)
-
-diff --git src/file_analysis/analyzer/x509/OCSP.cc src/file_analysis/analyzer/x509/OCSP.cc
-index bea88fc747..537d194906 100644
---- src/file_analysis/analyzer/x509/OCSP.cc
-+++ src/file_analysis/analyzer/x509/OCSP.cc
-@@ -44,7 +44,7 @@ static Val* get_ocsp_type(RecordVal* args, const char* name)
- 
- static bool OCSP_RESPID_bio(OCSP_BASICRESP* basic_resp, BIO* bio)
- 	{
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 	ASN1_OCTET_STRING* key  = nullptr;
- 	X509_NAME*         name = nullptr;
- 
-@@ -423,7 +423,7 @@ void file_analysis::OCSP::ParseRequest(OCSP_REQUEST* req, const char* fid)
- 
- 	uint64 version = 0;
- 
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 	if ( req->tbsRequest->version )
- 		version = (uint64)ASN1_INTEGER_get(req->tbsRequest->version);
- #else
-@@ -495,7 +495,7 @@ void file_analysis::OCSP::ParseResponse(OCSP_RESPVal *resp_val, const char* fid)
- 	if ( !basic_resp )
- 		goto clean_up;
- 
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 	resp_data = basic_resp->tbsResponseData;
- 	if ( !resp_data )
- 		goto clean_up;
-@@ -506,7 +506,7 @@ void file_analysis::OCSP::ParseResponse(OCSP_RESPVal *resp_val, const char* fid)
- 	vl->append(resp_val->Ref());
- 	vl->append(status_val);
- 
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 	vl->append(new Val((uint64)ASN1_INTEGER_get(resp_data->version), TYPE_COUNT));
- #else
- 	vl->append(parse_basic_resp_data_version(basic_resp));
-@@ -526,7 +526,7 @@ void file_analysis::OCSP::ParseResponse(OCSP_RESPVal *resp_val, const char* fid)
- 		}
- 
- 	// producedAt
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 	produced_at = resp_data->producedAt;
- #else
- 	produced_at = OCSP_resp_get0_produced_at(basic_resp);
-@@ -551,7 +551,7 @@ void file_analysis::OCSP::ParseResponse(OCSP_RESPVal *resp_val, const char* fid)
- 		// cert id
- 		const OCSP_CERTID* cert_id = nullptr;
- 
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 		cert_id = single_resp->certId;
- #else
- 		cert_id = OCSP_SINGLERESP_get0_id(single_resp);
-@@ -618,7 +618,7 @@ void file_analysis::OCSP::ParseResponse(OCSP_RESPVal *resp_val, const char* fid)
- 			}
- 		}
- 
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 	i2a_ASN1_OBJECT(bio, basic_resp->signatureAlgorithm->algorithm);
- 	len = BIO_read(bio, buf, sizeof(buf));
- 	vl->append(new StringVal(len, buf));
-@@ -635,7 +635,7 @@ void file_analysis::OCSP::ParseResponse(OCSP_RESPVal *resp_val, const char* fid)
- 	certs_vector = new VectorVal(internal_type("x509_opaque_vector")->AsVectorType());
- 	vl->append(certs_vector);
- 
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 	certs = basic_resp->certs;
- #else
- 	certs = OCSP_resp_get0_certs(basic_resp);
-diff --git src/file_analysis/analyzer/x509/X509.cc src/file_analysis/analyzer/x509/X509.cc
-index 7571915207..600b3adb52 100644
---- src/file_analysis/analyzer/x509/X509.cc
-+++ src/file_analysis/analyzer/x509/X509.cc
-@@ -290,7 +290,7 @@ void file_analysis::X509::ParseSAN(X509_EXTENSION* ext)
- 				continue;
- 				}
- 
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 			const char* name = (const char*) ASN1_STRING_data(gen->d.ia5);
- #else
- 			const char* name = (const char*) ASN1_STRING_get0_data(gen->d.ia5);
-diff --git src/file_analysis/analyzer/x509/X509.h src/file_analysis/analyzer/x509/X509.h
-index b808b676fe..91a5a7a5a1 100644
---- src/file_analysis/analyzer/x509/X509.h
-+++ src/file_analysis/analyzer/x509/X509.h
-@@ -8,24 +8,27 @@
- #include "Val.h"
- #include "X509Common.h"
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10002000L || LIBRESSL_VERSION_NUMBER)
-+#if ( OPENSSL_VERSION_NUMBER < 0x10002000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 
- #define X509_get_signature_nid(x) OBJ_obj2nid((x)->sig_alg->algorithm)
- 
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || LIBRESSL_VERSION_NUMBER)
-+#if ( OPENSSL_VERSION_NUMBER < 0x1010000fL ) || defined(LIBRESSL_VERSION_NUMBER)
- 
- #define X509_OBJECT_new()   (X509_OBJECT*)malloc(sizeof(X509_OBJECT))
- #define X509_OBJECT_free(a) free(a)
- 
--#define OCSP_SINGLERESP_get0_id(s) (s)->certId
- #define OCSP_resp_get0_certs(x)    (x)->certs
- 
- #define EVP_PKEY_get0_DSA(p)    ((p)->pkey.dsa)
- #define EVP_PKEY_get0_EC_KEY(p) ((p)->pkey.ec)
- #define EVP_PKEY_get0_RSA(p)    ((p)->pkey.rsa)
- 
-+#if !defined(LIBRESSL_VERSION_NUMBER) || ( LIBRESSL_VERSION_NUMBER < 0x2070000fL )
-+
-+#define OCSP_SINGLERESP_get0_id(s) (s)->certId
-+
- static X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
- {
- 	if ( a == nullptr || a->type != X509_LU_X509 )
-@@ -57,6 +60,8 @@ static void RSA_get0_key(const RSA *r,
- 
- #endif
- 
-+#endif
-+
- namespace file_analysis {
- 
- class X509Val;
-diff --git src/file_analysis/analyzer/x509/functions.bif src/file_analysis/analyzer/x509/functions.bif
-index 0b18feb8fe..ec87a495b3 100644
---- src/file_analysis/analyzer/x509/functions.bif
-+++ src/file_analysis/analyzer/x509/functions.bif
-@@ -115,7 +115,7 @@ X509* x509_get_ocsp_signer(const STACK_OF(X509)* certs,
- 	const ASN1_OCTET_STRING* key  = nullptr;
- 	const X509_NAME*         name = nullptr;
- 
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 	OCSP_RESPID* resp_id = basic_resp->tbsResponseData->responderId;
- 
- 	if ( resp_id->type == V_OCSP_RESPID_NAME )
-@@ -348,7 +348,7 @@ function x509_ocsp_verify%(certs: x509_opaque_vector, ocsp_reply: string, root_c
- 
- 	// Because we actually want to be able to give nice error messages that show why we were
- 	// not able to verify the OCSP response - do our own verification logic first.
--#if ( OPENSSL_VERSION_NUMBER < 0x10100000L )
-+#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 	signer = x509_get_ocsp_signer(basic->certs, basic);
- #else
- 	signer = x509_get_ocsp_signer(OCSP_resp_get0_certs(basic), basic);
-@@ -714,7 +714,7 @@ function sct_verify%(cert: opaque of x509, logid: string, log_key: string, signa
- 	uint32 cert_length;
- 	if ( precert )
- 		{
--#if (OPENSSL_VERSION_NUMBER < 0x10002000L || LIBRESSL_VERSION_NUMBER)
-+#if ( OPENSSL_VERSION_NUMBER < 0x10002000L ) || defined(LIBRESSL_VERSION_NUMBER)
- 		x->cert_info->enc.modified = 1;
- 		cert_length = i2d_X509_CINF(x->cert_info, &cert_out);
- #else
diff --git a/srcpkgs/bro/patches/musl.patch b/srcpkgs/bro/patches/musl.patch
deleted file mode 100644
index e8a2c6da9d5..00000000000
--- a/srcpkgs/bro/patches/musl.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://github.com/danielguerra69/docker-bro-1
-
---- aux/binpac/lib/binpac.h.in.orig
-+++ aux/binpac/lib/binpac.h.in
-@@ -4,6 +4,7 @@
- #define binpac_h
- 
- #include <sys/param.h>
-+#include <sys/types.h>
- 
- #cmakedefine HOST_BIGENDIAN
- #ifdef HOST_BIGENDIAN
-
---- src/OSFinger.h.orig
-+++ src/OSFinger.h
-@@ -166,3 +166,57 @@
- #define MATCHFUZZY      0x2
- 
- #endif
-+
-+// For musl-libc
-+#ifndef  TCPOPT_EOL
-+# define        TCPOPT_EOL   0
-+#endif
-+
-+#ifndef TCPOPT_NOP
-+# define TCPOPT_NOP             1
-+#endif
-+
-+#ifndef TCPOPT_MAXSEG
-+# define TCPOPT_MAXSEG          2
-+#endif
-+
-+#ifndef TCPOLEN_MAXSEG
-+# define TCPOLEN_MAXSEG         4
-+#endif
-+
-+#ifndef TCPOPT_WINDOW
-+# define TCPOPT_WINDOW          3
-+#endif
-+
-+#ifndef TCPOLEN_WINDOW
-+# define TCPOLEN_WINDOW         3
-+#endif
-+
-+#ifndef TCPOPT_SACK_PERMITTED
-+# define TCPOPT_SACK_PERMITTED  4               /* Experimental */
-+#endif
-+
-+#ifndef TCPOLEN_SACK_PERMITTED
-+# define TCPOLEN_SACK_PERMITTED 2
-+#endif
-+
-+#ifndef TCPOPT_SACK
-+# define TCPOPT_SACK            5               /* Experimental */
-+#endif
-+
-+#ifndef TCPOPT_TIMESTAMP
-+# define TCPOPT_TIMESTAMP       8
-+#endif
-+
-+#ifndef TCPOLEN_TIMESTAMP
-+# define TCPOLEN_TIMESTAMP      10
-+#endif
-+
-+#ifndef TCPOLEN_TSTAMP_APPA
-+# define TCPOLEN_TSTAMP_APPA    (TCPOLEN_TIMESTAMP+2) /* appendix A */
-+#endif
-+
-+#ifndef TCPOPT_TSTAMP_HDR
-+# define TCPOPT_TSTAMP_HDR      \
-+    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
-+#endif
-
diff --git a/srcpkgs/bro/template b/srcpkgs/bro/template
deleted file mode 100644
index 12c14e82226..00000000000
--- a/srcpkgs/bro/template
+++ /dev/null
@@ -1,49 +0,0 @@
-# Template file for 'bro'
-pkgname=bro
-version=2.6.4
-revision=2
-archs="x86_64* i686* aarch64* armv7* ppc64*"
-build_style=cmake
-hostmakedepends="flex pkg-config python3"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel jemalloc-devel"
-short_desc="Advanced framework for network traffic analysis"
-maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://www.bro.org"
-distfiles="https://download.zeek.org/bro-${version}.tar.gz"
-checksum=a47a9cdcef0ea14d5f70c390ab266f0333063ff96f3869a5f1609581a1d1ceb7
-nocross="Needs to build part of itself to run, can't be built separately yet."
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		makedepends+=" musl-fts-devel"
-		;;
-esac
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			sed -i '/set(broxygen/i link_libraries("-lfts")' src/broxygen/CMakeLists.txt
-		;;
-	esac
-}
-
-post_install() {
-	vsv bro
-	vlicense COPYING
-}
-
-binpac_package() {
-	short_desc+=" - protocol parser compiler"
-	pkg_install() {
-		vmove /usr/bin/binpac
-	}
-}
-
-binpac-devel_package() {
-	short_desc+=" - protocol parser compiler library"
-	pkg_install() {
-		vmove /usr/include
-		vmove "/usr/lib/*.a"
-	}
-}
diff --git a/srcpkgs/zeek-devel b/srcpkgs/zeek-devel
new file mode 120000
index 00000000000..bd825eaacdb
--- /dev/null
+++ b/srcpkgs/zeek-devel
@@ -0,0 +1 @@
+zeek
\ No newline at end of file
diff --git a/srcpkgs/bro/files/bro/run b/srcpkgs/zeek/files/bro/run
similarity index 100%
rename from srcpkgs/bro/files/bro/run
rename to srcpkgs/zeek/files/bro/run
diff --git a/srcpkgs/zeek/files/zeek/run b/srcpkgs/zeek/files/zeek/run
new file mode 100644
index 00000000000..8d3fd5e36f2
--- /dev/null
+++ b/srcpkgs/zeek/files/zeek/run
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+ZEEKLOGDIR="/var/log/zeek"
+
+[ -r conf ] && . ./conf
+
+[ -d ${ZEEKLOGDIR} ] || mkdir -p ${ZEEKLOGDIR}
+
+cd $ZEEKLOGDIR
+exec zeek -i ${INTF:=eth0} ${ZEEKPOLICY}
diff --git a/srcpkgs/zeek/patches/fix-musl.patch b/srcpkgs/zeek/patches/fix-musl.patch
new file mode 100644
index 00000000000..f4dc549a115
--- /dev/null
+++ b/srcpkgs/zeek/patches/fix-musl.patch
@@ -0,0 +1,37 @@
+From 7e5f9b857eb78c4c17a1321a5a5a55bb4afcf2c9 Mon Sep 17 00:00:00 2001
+From: Andrew Benson <abenson@gmail.com>
+Date: Tue, 16 Jun 2020 17:59:44 -0500
+Subject: [PATCH] cmake: Make musl support more distro agnostic
+
+---
+ CMakeLists.txt | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index 9e6d5c73cb..3efae8fa6b 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -334,18 +334,11 @@ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
+ # Make everyone find the highwayhash includes
+ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/highwayhash)
+ 
+-# Alpine support
+-if ( ${CMAKE_SYSTEM_NAME} MATCHES Linux AND EXISTS /etc/os-release )
+-    execute_process(
+-        COMMAND grep -q alpine /etc/os-release
+-        RESULT_VARIABLE os_release_alpine
+-    )
+-
+-    if ( os_release_alpine EQUAL 0 )
+-        find_package(FTS REQUIRED)
+-        list(APPEND OPTLIBS ${FTS_LIBRARY})
+-        include_directories(BEFORE ${FTS_INCLUDE_DIR})
+-    endif ()
++# Determine if libfts is external to libc, i.e. musl
++find_package(FTS)
++if ( FTS_FOUND )
++    list(APPEND OPTLIBS ${FTS_LIBRARY})
++    include_directories(BEFORE ${FTS_INCLUDE_DIR})
+ endif ()
+ 
+ set(zeekdeps ${zeekdeps}
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
new file mode 100644
index 00000000000..cbf9712b60e
--- /dev/null
+++ b/srcpkgs/zeek/template
@@ -0,0 +1,73 @@
+# Template file for 'zeek'
+pkgname=zeek
+version=3.1.5
+revision=1
+archs="x86_64* i686* aarch64* armv7* ppc64*"
+build_style=cmake
+hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+ bind-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+short_desc="Advanced framework for network traffic analysis"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.zeek.org"
+distfiles="https://old.zeek.org/downloads/zeek-${version}.tar.gz"
+checksum=b944e8d47ac435bf83ba61cbfb66ce49eb11ca2fbbde1dc2bae638097ae399e7
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-fts-devel musl-legacy-compat"
+fi
+
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		mkdir -p native
+		cd native
+		CC=$CC_FOR_BUILD CFLAGS="$CFLAGS_FOR_BUILD" \
+		CXX=$CXX_FOR_BUILD CXXFLAGS="$CXXFLAGS_FOR_BUILD" \
+		LD=$LD_FOR_BUILD LDFLAGS="$LDFLAGS_FOR_BUILD" \
+		cmake ..
+		make ${makejobs} binpac bifcl
+		configure_args+="
+		 -DBIFCL_EXE_PATH:PATH=${wrksrc}/native/aux/bifcl/bifcl
+		 -DBINPAC_EXE_PATH:PATH=${wrksrc}/native/aux/binpac/src/binpac"
+		cd ..
+	fi
+}
+
+post_install() {
+	vsv zeek
+	vsv bro
+	vlicense COPYING
+}
+
+zeek-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/zeek/cmake
+	}
+}
+
+bro_package() {
+	archs=noarch
+	build_style=meta
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
+
+binpac_package() {
+	short_desc+=" - protocol parser compiler (transitional)"
+	build_style=meta
+	archs=noarch
+	depends="${sourcepkg}>=${version}_${revision}"
+}
+
+binpac-devel_package() {
+	short_desc+=" - protocol parser compiler library (transitional)"
+	build_style=meta
+	archs=noarch
+	depends="${sourcepkg}-devel>=${version}_${revision}"
+}

From 95cc7a78b89beb56cdebd23bef8083235640bab5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 28 Jul 2020 22:38:05 +0300
Subject: [PATCH 200/298] sublime-merge: update to 2027.

---
 srcpkgs/sublime-merge/template | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sublime-merge/template b/srcpkgs/sublime-merge/template
index 50aa13331a4..1291edc8411 100644
--- a/srcpkgs/sublime-merge/template
+++ b/srcpkgs/sublime-merge/template
@@ -1,19 +1,32 @@
 # Template file for 'sublime-merge'
 pkgname=sublime-merge
-version=2020
+version=2027
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
+hostmakedepends="w3m"
 depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
 short_desc="New Git client, from the makers of Sublime Text"
 maintainer="Adelmo Junior <noblehelm@gmail.com>"
-license="Proprietary"
+license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=f7670a0b0284937d4b94c2fa729459a70ad2b7f80a819935612c4675afc2b864
+checksum=d932503d4f006c02dbd2b787d4fb0001f730fbdfe2f51fb9b55dd5d16d0859ff
+_license_checksum=aaf2f4a457945145bfea1ff06498806bd91951f76ec3cefec169f904ff4cb158
 nopie=yes
 repository=nonfree
 
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	w3m -dump -I utf-8 -T text/html < eula > EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
 do_install() {
 	vmkdir "usr/bin"
 	vmkdir "usr/share/sublime_merge"
@@ -24,4 +37,5 @@ do_install() {
 	done
 	ln -s /usr/share/sublime_merge/sublime_merge ${DESTDIR}/usr/bin/subl-merge
 	sed -i 's:Exec=/opt/sublime_merge/sublime_merge:Exec=/usr/share/sublime_merge/sublime_merge:' ${DESTDIR}/usr/share/applications/sublime_merge.desktop
+	vlicense EULA
 }

From fdf2821aa1eefe3ec0bd03188b81e967c7a76410 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 28 Jul 2020 23:56:54 +0200
Subject: [PATCH 201/298] cbindgen: update to 0.14.3.

---
 srcpkgs/cbindgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index ca07cc8d543..6981989239c 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -1,6 +1,6 @@
 # Template file for 'cbindgen'
 pkgname=cbindgen
-version=0.14.2
+version=0.14.3
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
@@ -8,4 +8,4 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
-checksum=8047238adf82fbd33d92c362585de24d80fe594cab0909c5bf91d046f1b598ff
+checksum=a995260beb11b7d7d96265ba091f255302fbf9b047cab61379ebd75ff779215e

From 2402ffc44fc8cf078520c47651874035d5ba2930 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 28 Jul 2020 23:58:21 +0200
Subject: [PATCH 202/298] firefox: update to 79.0

---
 .../firefox/patches/avoid-redefinition.patch  |  15 ++
 .../patches/big-endian-image-decoders.patch   |  88 +++++++++++
 .../disable-image-format-warning.patch        |  15 --
 .../patches/fix-image-format-warning.patch    |  39 +++++
 srcpkgs/firefox/patches/fix-tools.patch       |  12 --
 srcpkgs/firefox/patches/flac-no-ffvpx.patch   |  26 ++++
 srcpkgs/firefox/patches/skia-sucks1.patch     | 147 +++++++++---------
 srcpkgs/firefox/patches/skia-sucks3.patch     |  28 +++-
 srcpkgs/firefox/template                      |   4 +-
 9 files changed, 267 insertions(+), 107 deletions(-)
 create mode 100644 srcpkgs/firefox/patches/avoid-redefinition.patch
 create mode 100644 srcpkgs/firefox/patches/big-endian-image-decoders.patch
 delete mode 100644 srcpkgs/firefox/patches/disable-image-format-warning.patch
 create mode 100644 srcpkgs/firefox/patches/fix-image-format-warning.patch
 create mode 100644 srcpkgs/firefox/patches/flac-no-ffvpx.patch

diff --git a/srcpkgs/firefox/patches/avoid-redefinition.patch b/srcpkgs/firefox/patches/avoid-redefinition.patch
new file mode 100644
index 00000000000..0f17779c401
--- /dev/null
+++ b/srcpkgs/firefox/patches/avoid-redefinition.patch
@@ -0,0 +1,15 @@
+Author: Rasmus Thomsen <oss@cogitri.dev>
+Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
+(linux/if.h), leading to redefinitions. We need to include net/if.h before
+linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
+Upstream: No
+--- media/mtransport/third_party/nICEr/src/stun/addrs-netlink.c.orig	2020-07-28 19:24:32.359751046 +0200
++++ media/mtransport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:37.856343751 +0200
+@@ -31,6 +31,7 @@
+ */
+ 
+ #if defined(LINUX)
++#include <net/if.h>
+ #include "addrs-netlink.h"
+ #include <csi_platform.h>
+ #include <assert.h>
diff --git a/srcpkgs/firefox/patches/big-endian-image-decoders.patch b/srcpkgs/firefox/patches/big-endian-image-decoders.patch
new file mode 100644
index 00000000000..ccb417b61f1
--- /dev/null
+++ b/srcpkgs/firefox/patches/big-endian-image-decoders.patch
@@ -0,0 +1,88 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1626236
+https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096
+
+# HG changeset patch
+# User msirringhaus@suse.de
+# Date 1582805876 -3600
+#      Thu Feb 27 13:17:56 2020 +0100
+# Node ID cc3d09abea31068e57f1ab918782f9f86fc6a158
+# Parent  9cd90914846f667f18babc491a74c164ae5d6e9f
+imported patch decoder_workaround.patch
+
+diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
+--- image/decoders/nsGIFDecoder2.cpp	Thu Feb 27 12:57:14 2020 +0100
++++ image/decoders/nsGIFDecoder2.cpp	Fri Mar 27 13:06:18 2020 +0100
+@@ -422,6 +422,9 @@
+   MOZ_ASSERT(mSwizzleFn);
+   uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
+   mSwizzleFn(data, data, aColors);
++#if MOZ_BIG_ENDIAN()
++  SwizzleRow(SurfaceFormat::A8R8G8B8, SurfaceFormat::B8G8R8A8)(data, data, aColors);
++#endif
+ }
+ 
+ LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
+diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
+--- image/decoders/nsJPEGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
++++ image/decoders/nsJPEGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+@@ -263,6 +263,9 @@
+         case JCS_YCbCr:
+           // By default, we will output directly to BGRA. If we need to apply
+           // special color transforms, this may change.
++#if MOZ_BIG_ENDIAN()
++          mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
++#else
+           switch (SurfaceFormat::OS_RGBX) {
+             case SurfaceFormat::B8G8R8X8:
+               mInfo.out_color_space = JCS_EXT_BGRX;
+@@ -277,6 +280,7 @@
+               mState = JPEG_ERROR;
+               return Transition::TerminateFailure();
+           }
++#endif
+           break;
+         case JCS_CMYK:
+         case JCS_YCCK:
+diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
+--- image/decoders/nsPNGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
++++ image/decoders/nsPNGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+@@ -361,7 +361,7 @@
+                                    IResumable* aOnResume) {
+   MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");
+ 
+-  return mLexer.Lex(aIterator, aOnResume,
++  LexerResult res = mLexer.Lex(aIterator, aOnResume,
+                     [=](State aState, const char* aData, size_t aLength) {
+                       switch (aState) {
+                         case State::PNG_DATA:
+@@ -371,6 +371,14 @@
+                       }
+                       MOZ_CRASH("Unknown State");
+                     });
++
++#if MOZ_BIG_ENDIAN()
++  if(res.is<TerminalState>() && res.as<TerminalState>() == TerminalState::SUCCESS) {
++      NativeEndian::swapToLittleEndianInPlace<uint32_t>((uint32_t*)(mImageData), mImageDataLength / 4);
++  }
++#endif
++
++  return res;
+ }
+ 
+ LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
+diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp
+--- image/decoders/nsWebPDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
++++ image/decoders/nsWebPDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+@@ -237,7 +237,12 @@
+   // WebP doesn't guarantee that the alpha generated matches the hint in the
+   // header, so we always need to claim the input is BGRA. If the output is
+   // BGRX, swizzling will mask off the alpha channel.
++#if MOZ_BIG_ENDIAN()
++  mBuffer.colorspace = MODE_ARGB;
++  SurfaceFormat inFormat = mFormat;
++#else
+   SurfaceFormat inFormat = SurfaceFormat::OS_RGBA;
++#endif
+ 
+   SurfacePipeFlags pipeFlags = SurfacePipeFlags();
+   if (mFormat == SurfaceFormat::OS_RGBA &&
diff --git a/srcpkgs/firefox/patches/disable-image-format-warning.patch b/srcpkgs/firefox/patches/disable-image-format-warning.patch
deleted file mode 100644
index bd56e6bc37c..00000000000
--- a/srcpkgs/firefox/patches/disable-image-format-warning.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Imported from Adélie. Firefox is prone to this warning on BE and
-it leads to huge .xsession-errors, and the warning is not very
-important or meaningful, so just disable it.
-
---- gfx/2d/HelpersCairo.h
-+++ gfx/2d/HelpersCairo.h
-@@ -147,7 +147,7 @@
-     case SurfaceFormat::R5G6B5_UINT16:
-       return CAIRO_FORMAT_RGB16_565;
-     default:
--      gfxCriticalError() << "Unknown image format " << (int)format;
-+      //gfxCriticalError() << "Unknown image format " << (int)format;
-       return CAIRO_FORMAT_ARGB32;
-   }
- }
diff --git a/srcpkgs/firefox/patches/fix-image-format-warning.patch b/srcpkgs/firefox/patches/fix-image-format-warning.patch
new file mode 100644
index 00000000000..9b3b38d9065
--- /dev/null
+++ b/srcpkgs/firefox/patches/fix-image-format-warning.patch
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User Lee Salzman <lsalzman@mozilla.com>
+# Date 1462463631 14400
+#      Thu May 05 11:53:51 2016 -0400
+# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
+# Parent  29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
+handle big-endian formats in Cairo format conversions
+
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
+     case SurfaceFormat::R5G6B5_UINT16:
+       return CAIRO_FORMAT_RGB16_565;
+     default:
+-      gfxCriticalError() << "Unknown image format " << (int)format;
++      // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms,
++      // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32.
++      // See bug 1269654
++      if (format == SurfaceFormat::B8G8R8X8) {
++        return CAIRO_FORMAT_RGB24;
++      } else if (format != SurfaceFormat::B8G8R8A8) {
++        gfxCriticalError() << "Unknown image format " << (int)format;
++      }
+       return CAIRO_FORMAT_ARGB32;
+   }
+ }
+@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent(
+     case SurfaceFormat::A8:
+       return CAIRO_CONTENT_ALPHA;
+     default:
+-      gfxCriticalError() << "Unknown image content format " << (int)format;
++      if (format == SurfaceFormat::B8G8R8X8) {
++        return CAIRO_CONTENT_COLOR;
++      } else if (format != SurfaceFormat::B8G8R8A8) {
++        gfxCriticalError() << "Unknown image content format " << (int)format;
++      }
+       return CAIRO_CONTENT_COLOR_ALPHA;
+   }
+ }
diff --git a/srcpkgs/firefox/patches/fix-tools.patch b/srcpkgs/firefox/patches/fix-tools.patch
index d29da8bb54b..1af39bc6118 100644
--- a/srcpkgs/firefox/patches/fix-tools.patch
+++ b/srcpkgs/firefox/patches/fix-tools.patch
@@ -1,17 +1,5 @@
 --- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
 +++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
-@@ -253,7 +253,11 @@
- 
-   // Request profiling signals.
-   struct sigaction sa;
-+#if defined(GP_ARCH_arm)
-+  sa.sa_sigaction = SigprofHandler;
-+#else
-   sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler);
-+#endif
-   sigemptyset(&sa.sa_mask);
-   sa.sa_flags = SA_RESTART | SA_SIGINFO;
-   if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) {
 @@ -497,8 +501,10 @@
  ucontext_t sSyncUContext;
  
diff --git a/srcpkgs/firefox/patches/flac-no-ffvpx.patch b/srcpkgs/firefox/patches/flac-no-ffvpx.patch
new file mode 100644
index 00000000000..247da71c362
--- /dev/null
+++ b/srcpkgs/firefox/patches/flac-no-ffvpx.patch
@@ -0,0 +1,26 @@
+Enable FLAC on platforms without ffvpx like powerpc*
+
+diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
+index 53fc3c9937f7..b23771ab80fa 100644
+--- dom/media/flac/FlacDecoder.cpp
++++ dom/media/flac/FlacDecoder.cpp
+@@ -7,6 +7,7 @@
+ #include "FlacDecoder.h"
+ #include "MediaContainerType.h"
+ #include "mozilla/StaticPrefs_media.h"
++#include "PDMFactory.h"
+ 
+ namespace mozilla {
+ 
+@@ -14,6 +15,11 @@ namespace mozilla {
+ bool FlacDecoder::IsEnabled() {
+ #ifdef MOZ_FFVPX
+   return StaticPrefs::media_flac_enabled();
++#elif defined(MOZ_FFMPEG)
++  RefPtr<PDMFactory> platform = new PDMFactory();
++  return StaticPrefs::media_flac_enabled() &&
++         platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
++                                    /* DecoderDoctorDiagnostics* */ nullptr);
+ #else
+   // Until bug 1295886 is fixed.
+   return false;
diff --git a/srcpkgs/firefox/patches/skia-sucks1.patch b/srcpkgs/firefox/patches/skia-sucks1.patch
index 223c9b14e6b..05ad34a3fc3 100644
--- a/srcpkgs/firefox/patches/skia-sucks1.patch
+++ b/srcpkgs/firefox/patches/skia-sucks1.patch
@@ -1,84 +1,77 @@
-# HG changeset patch
-# Parent  548d0a2f3a22bfac32ec0c3921c6c969c8bf32a9
+https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
+https://bugzilla.mozilla.org/attachment.cgi?id=9028600
 
-diff -r 548d0a2f3a22 gfx/2d/ConvolutionFilter.cpp
---- gfx/2d/ConvolutionFilter.cpp	Mon Jul 22 16:57:54 2019 +0200
-+++ gfx/2d/ConvolutionFilter.cpp	Thu Jul 25 14:27:59 2019 +0200
-@@ -35,9 +35,38 @@
-   return true;
+--- gfx/skia/skia/third_party/skcms/skcms.cc
++++ gfx/skia/skia/third_party/skcms/skcms.cc
+@@ -30,6 +30,8 @@
+         #include <avx512fintrin.h>
+         #include <avx512dqintrin.h>
+     #endif
++#elif defined(__BIG_ENDIAN__)
++    #define SKCMS_PORTABLE
+ #endif
+ 
+ // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
+@@ -280,20 +282,28 @@ enum {
+ static uint16_t read_big_u16(const uint8_t* ptr) {
+     uint16_t be;
+     memcpy(&be, ptr, sizeof(be));
+-#if defined(_MSC_VER)
+-    return _byteswap_ushort(be);
++#if defined(__BIG_ENDIAN__)
++    return be;
+ #else
++    #if defined(_MSC_VER)
++    return _byteswap_ushort(be);
++    #else
+     return __builtin_bswap16(be);
++    #endif
+ #endif
  }
  
-+static void ByteSwapArray(uint8_t *u8Array, int32_t size) {
-+    uint32_t *array = reinterpret_cast<uint32_t*>(u8Array);
-+    for (int pxl = 0; pxl < size; ++pxl) {
-+        // Use an endian swap to move the bytes, i.e. BGRA -> ARGB.
-+        uint32_t rgba = array[pxl];
-+        array[pxl] = NativeEndian::swapToLittleEndian(rgba);
-+    }
-+}
-+
- void ConvolutionFilter::ConvolveHorizontally(const uint8_t* aSrc, uint8_t* aDst,
-                                              bool aHasAlpha) {
-+#ifdef MOZ_BIG_ENDIAN
-+    int outputSize = mFilter->numValues();
-+
-+    // Input size isn't handed in, so we have to calculate it quickly
-+    int inputSize = 0;
-+    for (int xx = 0; xx < outputSize; ++xx) {
-+        // Get the filter that determines the current output pixel.
-+        int filterOffset, filterLength;
-+        mFilter->FilterForValue(xx, &filterOffset, &filterLength);
-+        inputSize = std::max(inputSize, filterOffset + filterLength);
-+    }
-+
-+    ByteSwapArray((uint8_t*)aSrc, inputSize);
-+#endif
-+
-   SkOpts::convolve_horizontally(aSrc, *mFilter, aDst, aHasAlpha);
-+
-+#ifdef MOZ_BIG_ENDIAN
-+    ByteSwapArray((uint8_t*)aSrc, inputSize);
-+    ByteSwapArray(aDst, outputSize);
-+#endif
+ static uint32_t read_big_u32(const uint8_t* ptr) {
+     uint32_t be;
+     memcpy(&be, ptr, sizeof(be));
+-#if defined(_MSC_VER)
+-    return _byteswap_ulong(be);
++#if defined(__BIG_ENDIAN__)
++    return be;
+ #else
++    #if defined(_MSC_VER)
++    return _byteswap_ulong(be);
++    #else
+     return __builtin_bswap32(be);
++    #endif
+ #endif
  }
  
- void ConvolutionFilter::ConvolveVertically(uint8_t* const* aSrc, uint8_t* aDst,
-@@ -49,8 +78,26 @@
-   int32_t filterLength;
-   auto filterValues =
-       mFilter->FilterForValue(aRowIndex, &filterOffset, &filterLength);
-+
-+#ifdef MOZ_BIG_ENDIAN
-+  for (int filterY = 0; filterY < filterLength; filterY++) {
-+      // Skia only knows LE, so we have to swizzle the input
-+    ByteSwapArray(aSrc[filterY], aRowSize);
-+  }
-+#endif
-+
-   SkOpts::convolve_vertically(filterValues, filterLength, aSrc, aRowSize, aDst,
-                               aHasAlpha);
-+
-+#ifdef MOZ_BIG_ENDIAN
-+  // After skia is finished, we swizzle back to BE, in case
-+  // the input is used again somewhere else
-+  for (int filterY = 0; filterY < filterLength; filterY++) {
-+    ByteSwapArray(aSrc[filterY], aRowSize);
-+  }
-+  // The destination array as well
-+  ByteSwapArray(aDst, aRowSize);
-+#endif
+--- gfx/2d/DrawTargetSkia.cpp
++++ gfx/2d/DrawTargetSkia.cpp
+@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
+   return surfaceBounds.Intersect(bounds);
  }
  
- /* ConvolutionFilter::ComputeResizeFactor is derived from Skia's
-diff -r 548d0a2f3a22 gfx/skia/skia/include/core/SkPreConfig.h
---- gfx/skia/skia/include/core/SkPreConfig.h	Mon Jul 22 16:57:54 2019 +0200
-+++ gfx/skia/skia/include/core/SkPreConfig.h	Thu Jul 25 14:27:59 2019 +0200
-@@ -73,7 +73,7 @@
-       defined(__ppc__) || defined(__hppa) || \
-       defined(__PPC__) || defined(__PPC64__) || \
-       defined(_MIPSEB) || defined(__ARMEB__) || \
--      defined(__s390__) || \
-+      defined(__s390__) || defined(__s390x__) || \
-       (defined(__sh__) && defined(__BIG_ENDIAN__)) || \
-       (defined(__ia64) && defined(__BIG_ENDIAN__))
-          #define SK_CPU_BENDIAN
+-static const int kARGBAlphaOffset =
+-    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
++static const int kARGBAlphaOffset = 0;
+ 
+ static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
+                              const int32_t aStride, SurfaceFormat aFormat) {
+--- gfx/2d/Types.h
++++ gfx/2d/Types.h
+@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t {
+ // The following values are endian-independent synonyms. The _UINT32 suffix
+ // indicates that the name reflects the layout when viewed as a uint32_t
+ // value.
+-#if MOZ_LITTLE_ENDIAN()
+   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
+   X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
+-#elif MOZ_BIG_ENDIAN()
+-  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB
+-  X8R8G8B8_UINT32 = X8R8G8B8,  // 0x00RRGGBB
+-#else
+-#  error "bad endianness"
+-#endif
+ 
+   // The following values are OS and endian-independent synonyms.
+   //
diff --git a/srcpkgs/firefox/patches/skia-sucks3.patch b/srcpkgs/firefox/patches/skia-sucks3.patch
index d95b81698e9..f4e890f0536 100644
--- a/srcpkgs/firefox/patches/skia-sucks3.patch
+++ b/srcpkgs/firefox/patches/skia-sucks3.patch
@@ -1,3 +1,5 @@
+CompositableHost.cpp patch added by @q66, based on patch in issue 1602730.
+
 # HG changeset patch
 # Parent  46ea866ca3acb8bb5e1709ceb799b9c94f591dec
 Problem description: Tab-titles that are too long to fit into a tab get faded out.
@@ -17,7 +19,7 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
        SkCanvas::kPreserveLCDText_SaveLayerFlag |
            (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
  
-+#if MOZ_BIG_ENDIAN
++#if MOZ_BIG_ENDIAN()
 +  // Pushing a layer where an aMask is defined produces wrong output.
 +  // We _should_ endian swap the data, but I couldn't find a workable way to do so
 +  // Therefore I deactivate those layers in the meantime.
@@ -28,3 +30,27 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
    mCanvas->saveLayer(saveRec);
  
    SetPermitSubpixelAA(aOpaque);
+--- gfx/layers/composite/CompositableHost.cpp
++++ gfx/layers/composite/CompositableHost.cpp
+@@ -13,6 +13,7 @@
+ #include "ImageHost.h"  // for ImageHostBuffered, etc
+ #include "Layers.h"
+ #include "TiledContentHost.h"  // for TiledContentHost
++#include "mozilla/EndianUtils.h"
+ #include "mozilla/gfx/gfxVars.h"
+ #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor
+ #include "mozilla/layers/TextureHost.h"     // for TextureHost, etc
+@@ -92,9 +93,13 @@ bool CompositableHost::AddMaskEffect(EffectChain& aEffects,
+   }
+   MOZ_ASSERT(source);
+ 
++  // Setting an alpha-mask here breaks the URL-bar on big endian (s390x)
++  // if the typed URL is too long for the textbox (automatic scrolling needed)
++#if MOZ_LITTLE_ENDIAN()
+   RefPtr<EffectMask> effect =
+       new EffectMask(source, source->GetSize(), aTransform);
+   aEffects.mSecondaryEffects[EffectTypes::MASK] = effect;
++#endif
+   return true;
+ }
+ 
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 25fe340f343..88ecd5b47c0 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=78.0.2
+version=79.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=1aa00ec6d40a771d525b867b175be28eda096becc745875bcceb133a985750fc
+checksum=12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713
 
 lib32disabled=yes
 

From 937f6aa311ae6275ce7d035ebe4e82e8d8a6f3ae Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 1 Aug 2020 20:41:08 +0200
Subject: [PATCH 203/298] firefox-i18n: update to 79.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index f549123e50c..a148c2a7e14 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=78.0.1
+version=79.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="90521f2667cde54440a61d155677169b7bdc09f440383b0258096952131b4f62
- 0af04db105a7cdadf8f6fc39d454c3a15de5d7a2ee5117cd29a059c60c604d15
- 47b417f44ce952a1fd451e16bc31cf6c7045a6dff93f37780c935c7537c26119
- 97734b492dc7b7a3a4bc9780e5bc353afbfe0499b01c7682dba09e454156ac0c
- 38428fcc196f2ff890fae6e54dc18272f6402dc66c85002e73c24ccc28875beb
- 234b3981dfe399ffd2726c2584300ca8f83458f63897c61e8ac244043d1fb1cf
- 76f8272f129a6daf7c90ac25a346186974b5fa9afbcb694842d073951fa54552
- bd8b2d2a607954de2d3bab4b94417f81f9e5852ecd1a2312f53e4d4be8159fbd
- ebbf458a3ce8d356f344bd4e3a535679b3c0b89b125d63304bb44983fc27e9b6
- 08ce3b3ca2fd263ed719afc32be5a563c84a3e7bbc445870b46048781a7da919
- 41fb7385a65b51a6d73fdc3225f781f36d403620323ffdc6430808a1c4ff4eaa
- 07d438f10f3e39ecb414aab86009469a30415034a5116c9e5e809618d5a281c6
- 781ab7889dcab32c3df9b4eaa9fa2b6cb39c5361341a212cae304cf26a494296
- 4c534a68fb342eb666298e158cc20711fd92e9c9e4430693c46977a596086bd7
- 1bb2872cf1a7e879608ce8f50432b978835054d189317d5a6ff82ef5bb4c8181
- 28c2f16e0c377aaf1d298eb63ce81777107be1673295e3f59539ebec235fe5c8
- fc97cd0744e04af274b32d4d97afe01b96f4c35735461b740eba2abffe597d72
- 5e507acfd977dfe2d325db0ec7bdc961c00a08b66e89e8a88168d9a2d5024874
- a0122cc935a022be804688a1d551a98d05d8ce1f6ce5e10d8e3dd0c7adab45ef
- cd966b155cfb0b6f8f1b0ead85ca3469fee13dfa668c22f331fc8f92b12d02c6
- 366dff0773dde7ec8766994f6e7590b62fcfd93e6d1617db9edb1e9a781434d8
- c31fe1e438be42d0ea827164469256bb59e75e129840712acbe4ebb49c39a8fb
- 7bb78e8eb556454b605e949066527b5fadc1ad38c546f59f67a055f7bbcbcd3c
- 65c90e8ecc5237c0c9e288b759364fe6db5286550c4e1870e2e71f1b6a0cab32
- 87bbabd0500a97c0f57c6bb55b331fe1fcb0e6a445bfc89ff4a721146762b913
- 9245bec16f2c3c5d0e2cd4dcfde62b421098d06d3bc5044a290493f4dbeabc5f
- c86ea0f3890e59271adb420f9ca56d4072f5925f611714ecad104c62f637f041
- e7b113762b3fa60d219a8f22f2bbbc1743165261f36654f609222489c07e2ae3
- bdba4774c873744e53646087e72abcf35d1d8c84a51060c4477a23648fadbd3e
- 37b93f0fd21e1006a0b21ab725d9d050683945843ffc2348529bc1b492caffa2
- 6a8bda1b568333fe145b7a3ba290613c6ceb687aa589f697a6bd947c423642a3
- 7543e8d4ed7f944992382f3341a19e6bdad88ba55179445b587c36aa90462891
- a5e3ab6da8a414deb65766dda9362fb61657ec257c141728fe23d778ef58f92d
- 70d63163bb1331726e057d17cfdd97c661944f8ba81cb6a745adbe46dbe52bde
- c291cc8e20e3b66449ac68aa0f92c6d800a4cf2f837f9ac6b820cf77cb3f1397
- e5f25cd79c0ec35cffa3d6f092c2d1c92c6ef3807e90451959ffe2f4ccca7e22
- e39706a18fd58e400169aee275bb7e08e48067141191caf6cf7c08c34e161124
- 44cf48809085d963a9af740fcf0dfe291ea38a742869bd85c89637937414bb04
- 41fbc3a295e654590e0f1348ba103437eb2ba22ef18d8d9d24c5e4ccc43c9a74
- 8c596ca3df70350f89555012d0a73408616cee9f1eead7f5f413e0cd0152a98e
- 64546d9c4e649a6c7f8da845ae4e5bc5b8e415ceab3cf7b40f3588d6d8f8f933
- 16b414f06b50277fe7690d7a086a010ed665f55fad2727d22a91a9797d181943
- e8f8e3ea5fd7040e34e9320b4164fb543b8d7706ab87e0d9d43dd032526c4e81
- 0cf2a8d1f41a33b10b54ab87f35429e7a5ceb3a15110fa573b4707962e4f479f
- 762dd9d36e30b7449438d7daa342e026bef9fe5a01ae605204efc4946ba9e820
- f5f42b5764a8770e4da00f81a168bf86f8f30f3e29d71405c4bc9380cfee4ff4
- 2f25e294bed19d34a765431a386370056f5c8144c15ad4b817438c588cc5163d
- b720ebb5c53b299bea2872b50a4eed47327eaf8bd85fd900bdd2456781812c90
- fa39cf5f751cdd932610e3c81198647fc97e171b79c6f877b37d5fb639ea4e90
- f1916f059faefe1ca5d476e9ebb069fa8e69f30e1943fb88dff85c5d35b64aef
- a383d9fee42902815231e40b99bcad096dc0d45b5779449e3dc2de4f4bd26b93
- d552de68cf1f7b7ff3c066a37430d3422b672f51a4e52214592252f2c1359c8d
- 459689f3c5b53e337a15817617aa42722b5db7f09f7453a8dd02f13c01e492a2
- 1c70fb25038be21a055be1dcb690f7a23dc7436ef30f321b4520d43af9038921
- af653f080237b0a91a74c1f465acebe1851de7e890d46c6c3d8e6286fed7c11f
- c7beb3e3f98c18c0962cef4739edf370d99af2ee2fa89c2fd9bb1dc00b1ffd9c
- fa0ce6eb7b914d643b162aec4282049fe76d5f0eb6824b869be475cafbbbbcff
- 62a2fae53deeb417d33c94d144aab6f7d311510560b79a09b3a8940e3346bb1f
- 98a34320bad6e29fba9525362475eda9fdb13c33f79bb02b2a647cac0990112a
- b31a76aead78a10d251abbc23159ce65897b8af39d81a2d6237d9fce06244fc6
- 3877d7b633fb9aee4ad516a59abdca72ec3765ace81e0c014c9c6ba79ea7dcd6
- 68a6c43de1a4e63af63d9e4229e692d8e64b629ff018f9334911e9b0b37b586f
- 3a203b996140959d602e45a5347cab753d952df96fa4455330e9d21ced2aba46
- 3b1bdff5225dafb00826f1c45940fd84d354c9c8beb089d6653a9fd7a9d0e281
- f11e08ba479c81f3b09187a03d3f516527ede4201f931d59a95585b2c96a931d
- 02d53acbe28195551bd5a3690dc2ae151067f8ab6e8460e1bbfba7e7509c6f0d
- 393ae386d8e180623a1830e78a0bd4484f9054e8c6acbe8dd88a029eb8c48e2f
- c268f48d94cc249bfebe04e465656414dfffbaa5142447468d4f50a72df7e79a
- dd5899d331f51a7664d34730e4b5c7170fdc41a0959003d1b1bca3958156a01a
- a5819538f273b8d607dd3b15b22cdd776e0ce060bf1c903f93bf13197677f14f
- 3fb5aa0ae6a64beeb7c904a22a2261b1f024dce633f83f8c96f1667711ecb2fa
- 7ed9c83bf704980cd7b6f512d3147c1cf6ab55634701ac1cc844b61dabb9106e
- 638f250f425d968abcdb05fc06a2aed4a7f31fa4b8b9a863c43e46def03a88b7
- a953a778d8143a7524fec7f74798ed76537057e1e26f213a45c8e50f0cb991e7
- accbd49f05c83c670d78d8c31aa443af49763fea18dc56060e5ac560804bdeb1
- 8d9eb5f46a7273ba2434a6c841aaf62cda141c605be458f06e4bbee172c01082
- 71fcb289a444c393ead1449c92bbb70c282547fa32fe5bf3ceea3293d79aed1d
- 9974b184071d47df1cd3ca023b34b95a8f43974e166fef5bec3af9e9345032b0
- e4a41f7ebdedd2ea800ead2cb267c3e41f9f4a4c51f85ecafd53773c1dcdb0d0
- 29e45e23e11f07bcb09458c5da6f622ac076a8f6fa43eb56cc48e7cf722cbbf7
- 8c5991ec848ffa6f0b15a413ff74d913453464750888fd6ce559664eeb8203e2
- e7b074ed21f0f51bedb0759d96e2a301bda8f5c1e90d97bd78c208c0f1a51400
- c82d9a06fc6cd9def0b8bd28a8ba364275fc2f2593b3780a27499ba534e530db
- e6e492ab26ac9aae61faa57a98d1cdaca1af0d4782f77badd83a0bc327892b45
- 9c13e510d1404ca73b8445cac9290ee59e24ebb8c766974dfe11bf1f9cdd181e
- 24db16fcaec936cc312a9edb3c94ef5b9f55b2f06ef570d49296a0100045e52c
- 47034124aa0ac099a8aaf9f604da30ffdeaf133cf756150b7f5a71b1ccdbd6bd
- a0bcd7a835e0f1d13af3e0105f85ecd4b84e5c23159cb20b5178580235372dca
- 9c51bc7b4fdba58a5d329c455c96f2085d29f3873bf1fa5cd9de00b6ce589829
- 3f3148ba8a0aa6655cd68378f3727ea10b0d79bff84e89cd7156aad01723cc90
- 7678da76a31b55c4de34a1bb20444c4688f4555d356862e5078faa882e53cae9
- 2cb5fdb8812cddda1126928cad5b0b24b41fba347dc5d5f604c6579625386ccf
- 4cf0b2b8b61c4db730782686b082b3429745c5b1a60c4b4dd91f73ed839556b5
- e60de056209652559dc2c8508d2d68ae088ddebdd9eff9d9af8ebe4021cdab0c
- 90e758744e322ed8ae84fd84f313f34b321405caf641491ea3f37b7ca33907e0
- a3bf8b37fd9c4e3737aaeae0a148ae10bb1d5169eec7516f3b98e832af482f47"
+checksum="911ef827eaeab995e7270eeb28033fbc3ce402598ddf955014594d817d1c978f
+ 983b2eb7a8517afce57640680ee67560280fa45b49770b0c8d467206fbd8086d
+ 14614238df913b5ece0f97b61b4ee6752bce82522b34b39d6509821317665551
+ fd54d2d70afdb46c1c3d2ee98031f838c7b47794180ce382fc5e370689d8ef90
+ 3b6eb29eb88a36d5c9fb9b3c967a3d8861373d0b0d3f420b2286512941e0d019
+ 12e392c234918b9a55c54992dead682ce3f2a2222b8b000a06c8defbb1a8bb53
+ 1e4f7f853844c8574c04d181bf8e17c488c853f59359c09d5c6bc8055ef77069
+ 38628429290e0ed59a8f9f22cca9d104b301ba58d1e6ea03436fccab55b3b760
+ 30172930a46c697a8ab27dad7e69bcdcfe32f12f59d5078985dcef804ee587d4
+ b544eef867394c9bad066c8fc3181431c84c41d8dbb215145038f072197087f6
+ 5fd5902bf3ee95329fe92464a5245f309c37bf312d68f4b4b5e6c816cacdb946
+ c4ef2584152de8f07dcaba18d5299e8efbe7111ea630ef398afc348815ba68c5
+ 313e4e6a253930272c2e89dc5d55b19521d688640acc5eb40bf1e52f8976545a
+ 6f7b3e3f46218074eccba60f0155e4aa147f60b5e8dd15a9dfa779d4cef998f5
+ 02c3ce4c3d2aa978b48efdf4ab8f85e0c5016498c6399cc9bf47d1912b8709fc
+ c7f2fb867ce1963b9036862c4667bd079af2eab12b41beb2484f74834e84f08a
+ 72a931ff0a04675341041f1be2151c916720eb0488707cbe9fc1d7b0bbab8833
+ 3d47ee3cb1eee421d9dffada7a0f82dd487aa8576344010a096945390a270599
+ b983eb8987595c20228fd2a528f06dbd7c3600774387de7f9ee74994ecb265dd
+ a158c2ca320dd9bc63603cf26fede3596833a389983796f8ba6c8b65cbb0f003
+ d3036a9428be3c10756c9ac0c74b4e74d425913fd531ca053d58b33ef0e716cf
+ c5f38ad6a9a40b5946721f957e3252686c6bb9201755ac8b8d8c5d4ad44edfdb
+ e984841a7f5c9e26f5792dd7a621ee59bae8c42b9d616da77bf4430367dfb3d8
+ 9fd81a161083c4cf84d63f955a82ab64bdf7972f88b62a23b3ab52d2c8ef000d
+ af5e43b5e8a4072c073a1ca24f2a2f99656a26de1bd95eb68ac33c30edcb385e
+ 8d8ed077e50860356bbe30058ca2d87b6a398fc930025a34215b002ddc085046
+ a51da8b740522c4291581a1fdb94d976be8ec7be795069364fb329344df72aa0
+ eff776467a86a766b18d27f31ab0aac768e5a6f28420d73409c00b769ad1d460
+ 922ae040938bb0aac1c534e7bc8bd8165079204d98fd8e7b956f5a98502300e6
+ 24fc12e12b3e5c1cbfd55c5fb350c676607edbdfbafb41375b4be9929f6bdb9d
+ da53c7afd9b6f128f9b4b8a23af0a03459518ccbe668cf39711ff83482dafdae
+ 607c5570406365e44e38eb6d07047742f978717ebc381f32c813f6f0c123792e
+ 9d34a7d049fcd24038d25c993852a42fbd63a8023bca93e812b6fb88afa5e303
+ 8de7623c5f56764f3f2ee0b3271d2d3d877b5a5698b7a2199bf0721c35260219
+ 1c406fdddb13520e76888c74b95252e70d5827ce0f763c45104434bed654a34c
+ cdc6885ad11f2b4eebcdb050d7a6d30c933e7117a1783d277ab194496300e33f
+ edf5baa7426f19e266278553f513f8ffc521a7ce9ed5f50786203ca535cc59db
+ c78e49f49ba95d0ba7e97422d26c65474a6e21f66c8487b3ca415f6ff331b7b9
+ 16cba73411c97f0a218ff3408122d8137e44370695e499b2e39677bdeaf14844
+ 49bcd136fa6683ea110f5a1a06970bf3fdc76c27be4cc5b2e9ec5c296c167c14
+ f646ef3b54675dbe2d30c49983b3ecb7f2954485840b0d1bc7c4a0602d0aa3a9
+ 12ac52e8ea3a98812e0b0905b9273addd8d2377c86fa8245e5fb71c1c4fc2430
+ 0b759120041362b66a17b28b93ad50d983d849f1db997932877c35ac6cb5b68d
+ 0c07d678683d8f46dbe9cac11d90d3b4325bdc9b1c4ef7ed097f30086173b340
+ 3b7e4911bd52e3828a12acb026bc9d8c7246deb25a800e1ac9e137751f1c0e9d
+ 7d85bc754f6f7162f99074b27b2d362b4219dee77d4b284d7e2a08b6f3f6bba6
+ 1b0380fb6ed06998c35b711f80f88df004fd3b59f70f479421d0d404fc64aac9
+ ef2c8e2c12de18c00b319e980a6a7ddc2b85d9a752022eacbd7884771531fe03
+ 39bb628ccd04432e53b3a208cebc5afb758d07235f4ef09fc2edb94fafb9f7c2
+ ef05a3f38dbf89279d68cf9980e006e72bad9eb5bdc72ba84fce43dca01ed00e
+ c403c5c77657003605a600203c7d2f8600f28552f718fe054992f2a8683cf949
+ f0303d8437242ac039046cd8881d1112006c2a00221ae18a0eda41574a067003
+ 09f3ba18cf4f8a0192dcedd8f88ab25c8ea6b6d03f6421708051566d16044c0d
+ 8856408fcb3ba244bd8ba233864f4acd647e7027f3520fbc6ea6b75a4d8401ed
+ f8580345607aa9ea607d0b1b31347a056551229d272d273e04ecb39e4d151f27
+ dc6d54eac9ab6b210ae9538c8ac775e25e6bb7126b33379fc640f981a1f3991b
+ 665b0501b441a7f6bdba3da65af1be7d702d02c20347d53fb792a405a7030afe
+ 5ce07f2a5d4bd50d40d76521237428332c4c0245c4f323278ee0b7b01bf38dbc
+ 8de0de7cd2906f5763dada07994925ec9ecae8aefde7bd3510f3660e901666e6
+ 8cf69191d042e9ec3526d10fd880a99b37047900ec65b95efa5b11c5bf1d947d
+ 626a3ad4f9299243a359aeca86ccd9cc4544204f954f285df0adf358e522e046
+ b7756b7879d9a470bf0b35dba534331276e789e65a22ea1811196e63667f3896
+ 050d26f61ca79df60f94bedd1cc4498bf10f5a5a8164b3fb4a63e322ed6f6362
+ 5c0a09d7e79b96b858b60929f3dbed6a162a7c044fdce3ff57a098874af69eac
+ 761b1658dc876ee8c3c7da1c3f0d04625beeeac830dde44eaa0a5c21eab24164
+ 14ce371b6719ce2964192b1c5e3b2caf91600f55c3dfb7a254cbc8c0fbc260d5
+ 334aa328efc3c06906f69932aca2d3e5c32c099176dc1dee8a553830d2943326
+ d5df1afbca5db07ad0409d45a53185c7aa834ddac1f6710179811738984e6d7c
+ ae3cb5660aab88e51d37b57afdb7091ca48c7668cbd1a3fec54ca9060644ab3c
+ 9665152c43e712541687d45d8d5eb4a92dc4270c54dd8a3777f7edcfe4065a31
+ 480990e66dd7fc88cad381e66a39ea6c2ed474a460c869e322a51e45ea7ed4bd
+ 80b59e34c837f0685c65cb7bbc804f8e66c942be4f1bf7f2529af2adf347fd3e
+ ac0d61da046ca60e82e19537a88fc80a8e6cb9f41d8a9a13836f5be584d6eb20
+ 0e41681ae400eb512b51b42273370f8b757be79a0f97f81e04e0ae5623e9adfa
+ d5777d4382b482edb0059a62daef6b042cdb53abdd0e879b31fb46ac45f7671d
+ 63714549e9b8e74c55035d383f4e1e0303d9e49d8f422f7bc92cae30ce227322
+ 5ab137a12dc017e9bfab7666e928c6883caa0ce4b081d617dec9163d2a52700e
+ 3ab8e897ef31fbd4a94215b4bf8319b5b9322dd28209428424889b829269eb93
+ 3ca90a08b917edfb9cc7439e397641e8ef256e3693e0a86061e3ce2b42cd6f87
+ 96d049d031228e18a4bb3a515723b58f353dfe1ab0a61fd015cb1f285d289856
+ 09283c9bb05a84583488febbd7fbe3e8afeb0e9e56294099b0dad70424b16a78
+ 62eed45412ede9a0e4c1ed9a229489acb5c515dc0258137dd7340515e9e708ce
+ 339006144703992314f22081add5fcc30865059a36544ba40d3abfbb3a327a76
+ 8fbb77dad5b47f4e3e4f0811b6cac47a7c58c06d7dcfcab0a6589d1527a79f06
+ 0f2bd8d15e6ef273798c0107f3d24103f979b2e029fd0ca112ec92a98f6d6932
+ f082f6971a5e63e648315050197500f5201214f26d16b9a18d320407f2d6119c
+ 64d2b552712b7a42813cebfbb9f547f38850eca9ce35eda1cd8e3297534380cd
+ caf71fc4f1384f67c1e6eac9e086ae33f2b74124754de2742151e0d27ace7346
+ d0bb54c9e9a53c8f03b8e24ea1a1a8ba5e2a2195afb65ff6807fd2ab505b820d
+ a6a74a18c9b36bfcd8666f5b15694ce2411ddd6f9d1e6201abdfaf218214d4e8
+ e5224e49e367be23dd015fe0b827320e31bb93d32451741eb586c9826b143024
+ 4e5df2a926385f4dcd4575859fa3e84f480a539d71f060108f24651f479be775
+ dd36b49c232610bb722eea4491e418d4d1c4f3bad4060a34dd4c438b21f94f9c
+ f62d9bcb95b42f6666ebe5aa06bfa0124b99c91501675c27da96ddd899f39211
+ c9661940a2214310fad28e2400290d7226691546b613e55d4d01d5af4018e15a
+ 417c81b953dbea9bcb3fd8d600dd055d210df4f1298a961c98f3ab95df3cb830"

From b5c746a05b7f8f53c5f4033af5ab69affea00e09 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Mon, 27 Jul 2020 07:09:14 +0200
Subject: [PATCH 204/298] python3-Flask-SQLAlchemy: update to 2.4.4

---
 srcpkgs/python3-Flask-SQLAlchemy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Flask-SQLAlchemy/template b/srcpkgs/python3-Flask-SQLAlchemy/template
index 5f2037d3e06..392425b0610 100644
--- a/srcpkgs/python3-Flask-SQLAlchemy/template
+++ b/srcpkgs/python3-Flask-SQLAlchemy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Flask-SQLAlchemy'
 pkgname=python3-Flask-SQLAlchemy
-version=2.4.3
+version=2.4.4
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
@@ -12,7 +12,7 @@ maintainer="pulux <pulux@pf4sh.de>"
 license="MIT"
 homepage="https://github.com/pallets/flask-sqlalchemy"
 distfiles="${PYPI_SITE}/F/Flask-SQLAlchemy/Flask-SQLAlchemy-${version}.tar.gz"
-checksum=0b656fbf87c5f24109d859bafa791d29751fabbda2302b606881ae5485b557a5
+checksum=bfc7150eaf809b1c283879302f04c42791136060c6eeb12c0c6674fb1291fae5
 
 post_install() {
 	vlicense LICENSE.rst

From 07e354bf5d66902ecd43540ae432cd6b7293ffe9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 27 Jul 2020 01:27:31 +0300
Subject: [PATCH 205/298] xfce4-whiskermenu-plugin: update to 2.4.6.

---
 srcpkgs/xfce4-whiskermenu-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 02ff3e35e27..06942cca065 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
-version=2.4.5
+version=2.4.6
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=f5241910ea6411840b8c9f9471f0d262ab0583150bb82f9b280eccbaadb0ebbe
+checksum=8974d38cc87df528693efe4b6e14bcd233cdb49d2018a23ddddf745110b25744

From 1e615c817b8dd4205cc3827b5f3b25bdf0a70d51 Mon Sep 17 00:00:00 2001
From: mag <mag-one@autistici.org>
Date: Sat, 1 Aug 2020 15:36:35 +0200
Subject: [PATCH 206/298] faust: update to 2.27.1

---
 srcpkgs/faust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/faust/template b/srcpkgs/faust/template
index 14b79bb8878..e105fde7b59 100644
--- a/srcpkgs/faust/template
+++ b/srcpkgs/faust/template
@@ -1,6 +1,6 @@
 # Template file for 'faust'
 pkgname=faust
-version=2.20.2
+version=2.27.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="cmake pkg-config llvm"
@@ -10,7 +10,7 @@ maintainer="mag <mag-one@autistici.org>"
 license="GPL-2.0-or-later"
 homepage="http://faust.grame.fr/"
 distfiles=https://github.com/grame-cncm/faust/releases/download/${version}/${pkgname}-${version}.tar.gz
-checksum="c32588ee60d0f7ca25034d3d5436def6b35495f4d3beb3b02208d48684bcfbe9"
+checksum="aee292bafcb77021cca5a2e8645b8ef8d9fe76e5005382e24df0bed3f664d8f5"
 
 # Android stuffs, used by the 'faust2android' script.
 nostrip_files="libsndfile.so "

From de3f387940e233c66d516aa17e6f98c794954262 Mon Sep 17 00:00:00 2001
From: SolitudeSF <solitudesf@protonmail.com>
Date: Fri, 31 Jul 2020 23:28:42 +0300
Subject: [PATCH 207/298] gitui: update to 0.9.1

---
 srcpkgs/gitui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index b32b0126172..5494f0bf922 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,6 +1,6 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.8.1
+version=0.9.1
 revision=1
 build_style=cargo
 short_desc="Blazing fast terminal-ui for git"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/extrawurst/gitui"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=41662bb14ae89b9f25c2a956571a2855f977273261228f1ceba856fc8b7f2eca
+checksum=2112575a5ec65f744572d38df9f4f79e7547fc2139093a6c9cf2e9ad85bdf547
 
 post_install() {
 	vlicense LICENSE.md

From 4807640753a8fe17a0a757ceb219538d518681c5 Mon Sep 17 00:00:00 2001
From: Gerardo Di Iorio <arete74@gmail.com>
Date: Wed, 29 Jul 2020 00:27:09 +0200
Subject: [PATCH 208/298] minio: update to 2020.07.27.

---
 srcpkgs/minio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index ca581eb0cf6..db4d2457e89 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2020.07.24
+version=2020.07.27
 revision=1
-_version="${version//./-}T22-43-05Z"
+_version="${version//./-}T18-37-02Z"
 wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/minio/minio"
 distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz"
-checksum=2b8d5b4dcc1ee27071588f82b42ad054794b29320910d6289f27871b0a3145c6
+checksum=8a08c895fd955b587f78f53e5da91753116756f8ceb0742ec13b0e03da8bbedf
 system_accounts="_minio"
 _minio_homedir="/var/lib/minio"
 _minio_descr="Minio Daemon User"

From c431aa9f09dd58c943b492be5378017f12c4c028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 29 Jul 2020 00:14:19 +0200
Subject: [PATCH 209/298] cargo-deny: update to 0.7.2.

---
 srcpkgs/cargo-deny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 1d62d1fb5d0..640c7585305 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.7.1
+version=0.7.2
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=704c1999056d9ad4be466c16cf27147da7438c477edc21054bbb7210fdea0b53
+checksum=90b26b5eb137dc61d36a8467fc90d91e788948dc08a790f57971c6be38db01d1
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"

From 177816d370a301c43433850968049d38488ed825 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 1 Aug 2020 21:09:31 -0400
Subject: [PATCH 210/298] alacritty: update to 0.5.0.

Closes: #23995 [via git-merge-pr]
---
 srcpkgs/alacritty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index b0adfb49c7c..74ddfcd6d65 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,6 +1,6 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.4.3
+version=0.5.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/v${version}/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8bc0fc90b16187a4f75a834f29c4725b2c6cfbab9543fc36913ddd9aca604c42
+checksum=9bc0e6ff9a0772ea522d7e34ab8371faa96e6cc4e588459966585f0dbb848dcb
 
 post_install() {
 	vinstall ../extra/linux/Alacritty.desktop 644 usr/share/applications

From 8694c42b086c5882c822190913409e5cca3b6d50 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 2 Aug 2020 12:06:13 +0200
Subject: [PATCH 211/298] wine: update to 5.14.

---
 srcpkgs/wine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 39ef95b82f8..9d5d3e1c193 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=5.13
+version=5.14
 revision=1
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
@@ -9,7 +9,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=c46a5c1c2aaf41993de5a5e78b7780060e0e77066531d0ca672ae08e325e0152
+checksum=f442613537e90e67dbe8a5c4968c8bdb9a101a267892bb9ff67317e0b67fc9ef
 
 lib32mode=full
 archs="i686 x86_64*"

From 71acdc4ad2743390c32562cd9ebf57ff9ffd17fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:39:44 -0300
Subject: [PATCH 212/298] qtkeychain-qt5-devel: add libsecret-devel as dep.

libsecret-1 is referenced in one of its cmake files, and some
applications that don't directly depend on it still try to link to it.

Also fix xlint.
---
 srcpkgs/qtkeychain-qt5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qtkeychain-qt5/template b/srcpkgs/qtkeychain-qt5/template
index 847f074fc7f..9bac2f766d0 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -1,7 +1,7 @@
-# Template file for 'qtkeychain'
+# Template file for 'qtkeychain-qt5'
 pkgname=qtkeychain-qt5
 version=0.9.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -22,7 +22,7 @@ post_install() {
 }
 
 qtkeychain-qt5-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 77eea4eeac5456b62d8d39a1098ac36a9385563b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:03 -0300
Subject: [PATCH 213/298] tomahawk: update to 0.8.4_21, xlintify.

Update to a new commit to allow it to build properly.
---
 srcpkgs/tomahawk/template | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 3910267caa8..0edbacc5f8a 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,15 +1,10 @@
 # Template file for 'tomahawk'
 pkgname=tomahawk
 version=0.8.4
-revision=20
+revision=21
 wrksrc=${pkgname}-${_commit}
-_commit=00f602e10203b76fc28b4615868c567e6bd4ced4
+_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
 build_style=cmake
-build_options="upower hatchet kde xmpp"
-desc_option_hatchet="Enable support for http://hatchet.is"
-desc_option_kde="Enable support for KDE"
-desc_option_xmpp="Enable support for XMPP"
-build_options_default="xmpp upower"
 configure_args="-Wno-dev -DBUILD_RELEASE=ON \
  $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \
  -DBUILD_WITH_QT4=OFF \
@@ -21,7 +16,7 @@ hostmakedepends="pkg-config extra-cmake-modules"
 makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel
  libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel
  qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel
- quazip-devel sparsehash taglib-devel vlc-devel libsecret-devel
+ quazip-devel sparsehash taglib-devel vlc-devel
  $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)
  $(vopt_if kde telepathy-qt5-devel)"
 depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)"
@@ -30,7 +25,12 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tomahawk-player.org/"
 distfiles="https://github.com/tomahawk-player/tomahawk/archive/${_commit}.tar.gz"
-checksum=f93d36b246944657dcef98ff71410db8630c53b5565dc283fb15f57e5b301f79
+checksum=3305a8221af1bfa51cbf5256abf8ab3824393b684ce428a3c46409cf5e1d3fce
+build_options="upower hatchet kde xmpp"
+desc_option_hatchet="Enable support for http://hatchet.is"
+desc_option_kde="Enable support for KDE"
+desc_option_xmpp="Enable support for XMPP"
+build_options_default="xmpp upower"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
@@ -44,6 +44,8 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
+CXXFLAGS="-Wno-deprecated-declarations"
+
 tomahawk-devel_package() {
 	depends="tomahawk>=${version}_${revision}"
 	short_desc+=" - development files"

From 675219e62c7b1e549c5f1e733b3775053e8a55a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:27 -0300
Subject: [PATCH 214/298] chatterino2: remove libsecret-devel makedepends.

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 53e41580dbc..9c38a6bf08b 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -11,7 +11,7 @@ hostmakedepends="qt5-qmake qt5-svg-devel qt5-multimedia-devel
  libcommuni-devel pkg-config"
 makedepends="qt5-svg-devel qt5-multimedia-devel
  boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel libsecret-devel"
+ qtkeychain-qt5-devel"
 short_desc="Qt-based twitch chat client"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
 license="MIT"

From cca877065535bb5b270ffd45604e623eefcf6872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:42 -0300
Subject: [PATCH 215/298] Quaternion: remove libsecret-devel makedepends.

---
 srcpkgs/Quaternion/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 6aa90ef10de..47f72d33f24 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
  qt5-multimedia-devel libqmatrixclient-devel
- $(vopt_if qtkeychain 'qtkeychain-qt5-devel libsecret-devel')"
+ $(vopt_if qtkeychain qtkeychain-qt5-devel)"
 depends="qt5-quickcontrols"
 short_desc="Qt5-based IM client for the Matrix protocol"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
@@ -17,3 +17,5 @@ checksum=7c04f62f6420af87c1df9e5e7f01250a1f4da33c9627e5f6e7f772e2f62864f0
 
 build_options="qtkeychain"
 build_options_default="qtkeychain"
+
+CXXFLAGS="-Wno-deprecated-declarations"

From 97af679b170df30db1c86290bd62f1fcf68e8c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:47:17 -0300
Subject: [PATCH 216/298] New package: kstars-3.4.3.

---
 srcpkgs/kstars/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/kstars/template

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
new file mode 100644
index 00000000000..846f222164d
--- /dev/null
+++ b/srcpkgs/kstars/template
@@ -0,0 +1,21 @@
+# Template file for 'kstars'
+pkgname=kstars
+version=3.4.3
+revision=1
+build_style=cmake
+hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
+ kconfig"
+makedepends="extra-cmake-modules eigen qt5-devel qt5-declarative-devel
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+ qt5-plugin-tds qt5-svg-devel qt5-websockets-devel qt5-datavis3d-devel
+ cfitsio-devel  libnova-devel libraw-devel qtkeychain-qt5-devel
+ knotifyconfig-devel kauth-devel kconfig-devel kcrash-devel kdoctools-devel
+ kwidgetsaddons-devel knewstuff-devel ki18n-devel kio-devel kxmlgui-devel
+ kplotting-devel knotifications-devel"
+depends="xplanet"
+short_desc="Open source, cross-platform Astronomy Software by KDE"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-2.0-or-later"
+homepage="https://edu.kde.org/kstars/"
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=c81119a85e9265991dd0fbfafdc6ba797bf3bedce64f4d5260511bafccebbe48

From 60025897b58fa0074ec1c9b86fe8b1cb8ebc479b Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Sun, 2 Aug 2020 09:47:48 +0200
Subject: [PATCH 217/298] python3-matplotlib: depend on python3-Pillow

---
 srcpkgs/python3-matplotlib/files/README.voidlinux | 3 ---
 srcpkgs/python3-matplotlib/template               | 5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/files/README.voidlinux b/srcpkgs/python3-matplotlib/files/README.voidlinux
index f56b4d9ed03..47eefb2f120 100644
--- a/srcpkgs/python3-matplotlib/files/README.voidlinux
+++ b/srcpkgs/python3-matplotlib/files/README.voidlinux
@@ -9,8 +9,5 @@ For interactive graphics, install:
 
 The backend can be defined in $XDG_CONFIG_HOME/matplotlib/matplotlibrc
 
-Natively, matplotlib only supports PNG images. Install python3-Pillow
-to support more file formats.
-
 Matplotlib’s LaTeX support requires a working LaTeX installation and
 ghostscript.
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 7432eb0591c..b5056f1eba5 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
 version=3.3.0
-revision=1
+revision=2
 wrksrc="matplotlib-${version}"
 build_style=python3-module
 build_helper="numpy"
@@ -9,7 +9,8 @@ hostmakedepends="pkg-config python3-setuptools"
 # XXX use internal copy of agg, highly patched
 makedepends="python3-devel freetype-devel libpng-devel libqhull-devel"
 depends="python3-matplotlib-data>=${version}_${revision} python3-numpy
- python3-dateutil python3-parsing python3-cycler python3-kiwisolver"
+ python3-dateutil python3-parsing python3-cycler python3-kiwisolver
+ python3-Pillow"
 short_desc="Python3 2D/3D plotting library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="custom:matplotlib, BSD-3-Clause, MIT"

From 53dafd03ecd0d46504c94c2a380525ad39139f6a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Aug 2020 16:32:29 +0200
Subject: [PATCH 218/298] b3sum: update to 0.3.6.

---
 srcpkgs/b3sum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/b3sum/template b/srcpkgs/b3sum/template
index 0fb6619ceaf..f769dc77c3f 100644
--- a/srcpkgs/b3sum/template
+++ b/srcpkgs/b3sum/template
@@ -1,6 +1,6 @@
 # Template file for 'b3sum'
 pkgname=b3sum
-version=0.3.5
+version=0.3.6
 revision=1
 wrksrc="BLAKE3-${version}"
 build_wrksrc="b3sum"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CC0-1.0"
 homepage="https://github.com/BLAKE3-team/BLAKE3/"
 distfiles="https://github.com/BLAKE3-team/BLAKE3/archive/${version}.tar.gz"
-checksum=0f6892b7216291ab1a5b16cc40c01d7310b7d420ee38e779e5c45e49ca456e6b
+checksum=50a0eece4cde19605cd2b7ce7719755a4484952e7792338ec303bb5489466a2c

From 4b5ffd83497cece1cfdabb3034b57e370c7b72b6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Aug 2020 16:35:30 +0200
Subject: [PATCH 219/298] chibi-scheme: update to 0.9.

---
 srcpkgs/chibi-scheme/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/chibi-scheme/template b/srcpkgs/chibi-scheme/template
index da55e9984d5..6e419a62f08 100644
--- a/srcpkgs/chibi-scheme/template
+++ b/srcpkgs/chibi-scheme/template
@@ -1,15 +1,15 @@
 # Template file for 'chibi-scheme'
 pkgname=chibi-scheme
-version=0.8
-revision=2
+version=0.9
+revision=1
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
 short_desc="Small Footprint R7RS Scheme for use as a C Extension Language"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="3-clause-BSD"
+license="BSD-3-Clause"
 homepage="http://synthcode.com/scheme/chibi/"
 distfiles="https://github.com/ashinn/chibi-scheme/archive/${version}.tar.gz"
-checksum=8a077859b123216c123c243db391b0fe4c0cf73978c7cdd7b8ea853a48192756
+checksum=c61edd9b1891a3248bcd22002a938ccac06d05dbdd879ec34e90fef24451422a
 alternatives="
  scheme:scheme:/usr/bin/chibi-scheme
  scheme:scheme.1:/usr/share/man/man1/chibi-scheme.1

From 6d04f8324638e536d0dff583226200f147fda3c4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Aug 2020 16:39:07 +0200
Subject: [PATCH 220/298] perl-Hash-Merge: update to 0.302.

---
 srcpkgs/perl-Hash-Merge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Hash-Merge/template b/srcpkgs/perl-Hash-Merge/template
index 32ee022496b..8b01ec990ce 100644
--- a/srcpkgs/perl-Hash-Merge/template
+++ b/srcpkgs/perl-Hash-Merge/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Hash-Merge'
 pkgname=perl-Hash-Merge
-version=0.301
+version=0.302
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -14,4 +14,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="https://metacpan.org/release/Hash-Merge"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 distfiles="${CPAN_SITE}/Hash/Hash-Merge-${version}.tar.gz"
-checksum=29bbf71c0fe135916435e7a23b1f58038844ad9c915e53aea7e6005b3ce28c77
+checksum=ae0522f76539608b61dde14670e79677e0f391036832f70a21f31adde2538644

From 92fc02da3bfa24c280b8504809decad490196268 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Aug 2020 16:39:12 +0200
Subject: [PATCH 221/298] k9s: update to 0.21.4.

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index bc7a49cd0a6..c94bc6f3181 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.21.2
+version=0.21.4
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=db81555550681433d4e30bac354614b239261b44ac36442c808a5a2c29c9f5c1
+checksum=c14146ad906e037729bc91f9a82d16ae9a02c5fc4f50a566ddd19c8ecc609401

From ea545664ea2ecaadf792a546003e03b1a34de618 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Aug 2020 16:40:36 +0200
Subject: [PATCH 222/298] schedule: update to 8.0.1.

---
 srcpkgs/schedule/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/schedule/template b/srcpkgs/schedule/template
index e665545b3b3..0a5b7c03d6b 100644
--- a/srcpkgs/schedule/template
+++ b/srcpkgs/schedule/template
@@ -1,18 +1,16 @@
 # Template file for 'schedule'
 pkgname=schedule
-version=8.0
+version=8.0.1
 revision=1
 archs=noarch
 hostmakedepends="perl"
 depends="perl"
 short_desc="Framework to schedule jobs in a multiuser multitasking environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-# XXX: Get upstream to pick a license
-# tracking: https://github.com/vaeth/schedule/issues/1
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://github.com/vaeth/schedule/"
 distfiles="https://github.com/vaeth/schedule/archive/v${version}.tar.gz"
-checksum=04aa60c4e8aeae2c6c4c435d1bbbb16050937994a145bea7bb49353023c66133
+checksum=53401c2fd3add5a2495d02a8ef3dc2fbc9d61c164ec4777ba2ff51a67f2274d0
 
 do_install() {
 	for bin in bin/*; do

From 5df96e969180f3bc159bdeca980736247d98fbda Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Aug 2020 16:41:23 +0200
Subject: [PATCH 223/298] skaffold: update to 1.13.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index d83d4854804..2b09601f78f 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.12.1
+version=1.13.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=2fba4aa35fe639d8f89c354b07205e7e3271297a7e31517ec73f8087b6c65a99
+checksum=c106158af55157519ffdb78746939ae57c7e402c0d59295645a069c915b43d58

From 26ea7ab0c5ddf8283e9f956db252dac2c018b13c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Aug 2020 16:42:38 +0200
Subject: [PATCH 224/298] sysstat: update to 12.4.0.

---
 srcpkgs/sysstat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template
index f2d44ba0e58..5b5b1b9c8c7 100644
--- a/srcpkgs/sysstat/template
+++ b/srcpkgs/sysstat/template
@@ -1,6 +1,6 @@
 # Template file for 'sysstat'
 pkgname=sysstat
-version=12.2.2
+version=12.4.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-copy-only --disable-file-attr
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://pagesperso-orange.fr/sebastien.godard/"
 distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz"
-checksum=78388b64acec81378b962e66b40e57acd4b18ff17a849bc9308f95d290248c9c
+checksum=78556c339795ecd07eb10ee09e3f5d52901d3a29f874ae92b45efd0de7b62d16
 
 post_extract() {
 	vsed -i 's/lib64/lib/' configure

From 71c3239d797f1625a9be0696bc94dfa489681985 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 Aug 2020 14:22:16 +0200
Subject: [PATCH 225/298] fehQlibs: update to 15.

---
 srcpkgs/fehQlibs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fehQlibs/template b/srcpkgs/fehQlibs/template
index bf61b6d3a49..5263809348b 100644
--- a/srcpkgs/fehQlibs/template
+++ b/srcpkgs/fehQlibs/template
@@ -1,14 +1,14 @@
 # Template file for 'fehQlibs'
 pkgname=fehQlibs
-version=14
-revision=2
+version=15
+revision=1
 build_style=gnu-makefile
 short_desc="State-of-the-art C routines for Internet services"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.fehcom.de/ipnet/qlibs.html"
 distfiles="http://www.fehcom.de/ipnet/fehQlibs/fehQlibs-${version}.tgz"
-checksum=1ea19a0172cc9826fcd7e0b44cc93f6b928c8144dc90452474d9980f1f57f074
+checksum=c3f1e9ad15a6ab2c78024089dec5e8975e52d27c71a906c928980cf2f391d7fd
 disable_parallel_build=yes
 
 post_extract() {

From eeb9b179e8c4a445ff39577422b2eae97f0af8ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 Aug 2020 14:23:40 +0200
Subject: [PATCH 226/298] ucspi-tcp6: update to 1.11.5.

---
 srcpkgs/ucspi-tcp6/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ucspi-tcp6/template b/srcpkgs/ucspi-tcp6/template
index a921e814611..79d7005a246 100644
--- a/srcpkgs/ucspi-tcp6/template
+++ b/srcpkgs/ucspi-tcp6/template
@@ -1,6 +1,6 @@
 # Template file for 'ucspi-tcp6'
 pkgname=ucspi-tcp6
-version=1.11.4
+version=1.11.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="net/${pkgname}/${pkgname}-${version}/src"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://www.fehcom.de/ipnet/ucspi-tcp6.html"
 distfiles="http://www.fehcom.de/ipnet/ucspi-tcp6/ucspi-tcp6-${version}.tgz"
-checksum=612e37b6c0c7ceda02d1dfd6a6f17a06c01e00ce62f956f8db13f6bb15c4989a
+checksum=5c233720629435fadbf259e7780996b17ffa860ed214e5bcdbefbf313e98c848
 disable_parallel_build="ad hoc build system breaks parallel build"
 conflicts="ucspi-tcp>=0"
 

From a2ff78292356017f33049d3264c7403acf346e5f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 Aug 2020 14:24:51 +0200
Subject: [PATCH 227/298] ucspi-ssl: update to 0.11.5.

---
 srcpkgs/ucspi-ssl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index aa2701366ff..e80aab45d5c 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -1,8 +1,8 @@
 # Template file for 'ucspi-ssl'
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
-version=0.11.4
-revision=2
+version=0.11.5
+revision=1
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.fehcom.de/ipnet/ucspi-ssl.html"
 distfiles="http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-${version}.tgz"
-checksum=af008920a711cbe9ffbc1d17d790a7e00ba11a8df4aadace3ca43055b2b0d070
+checksum=c7840f73788020d6dddcc1f680234d41b387404e2465aef343447802e1cb831d
 # ad hoc build system breaks parallel build and cross-compilation
 disable_parallel_build="ad hoc build system breaks parallel build"
 

From 8c5790b60d08be9473c2bd5f46e11c2b1ed1abc6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 Aug 2020 14:30:41 +0200
Subject: [PATCH 228/298] sqmail: update to 4.0.08.

---
 srcpkgs/sqmail/patches/autouid.patch | 4 ++--
 srcpkgs/sqmail/template              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/sqmail/patches/autouid.patch b/srcpkgs/sqmail/patches/autouid.patch
index ecd9cfb7a82..43f3ecb88bd 100644
--- a/srcpkgs/sqmail/patches/autouid.patch
+++ b/srcpkgs/sqmail/patches/autouid.patch
@@ -1,7 +1,7 @@
 We generate the file auto_uids.c ourselves.
 
---- mail/sqmail/sqmail-4.0.07/src/Makefile.orig
-+++ mail/sqmail/sqmail-4.0.07/src/Makefile
+--- mail/sqmail/sqmail-4.0.08/src/Makefile.orig
++++ mail/sqmail/sqmail-4.0.08/src/Makefile
 @@ -95,20 +95,6 @@
  compile auto_split.c
  	./compile auto_split.c
diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 290a91eade0..33738df8111 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
-version=4.0.07
-revision=5
+version=4.0.08
+revision=1
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://www.fehcom.de/sqmail/sqmail.html"
 distfiles="https://www.fehcom.de/sqmail/sqmail-${version}.tgz"
-checksum=6ec1387fc43002148e9fc418fdc406ca88ee69c30210e7b736b35509ad098a81
+checksum=f477ffb5c0fb41ba8827db129e86507ce9e3c429b17782c7e2cb4a26e0edc70e
 nocross="custom build system"
 provides="smtp-server-0_1"
 replaces="smtp-server>=0"

From 10b8e6c1f9843ca9bd2bc64e92b16ce4022a5619 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 28 Jul 2020 18:03:32 +0300
Subject: [PATCH 229/298] CopyQ: update to 3.12.0.

Closes: #23899 [via git-merge-pr]
---
 srcpkgs/CopyQ/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index 258a78aba70..447598aa4a7 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=3.11.1
+version=3.12.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-tools-devel"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
 changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=a0b0a7d90aa67a48b4ab94b23bfa16da5602de80ef82862451bac619ede3d4bb
+checksum=7de74c4159514725f9de458a32d6109b3183b108c183d9a977e7b67ce5bbb1ee

From d1af822066fd6b9e5ab28380232510caf5203d1c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 24 Jul 2020 12:30:28 +0300
Subject: [PATCH 230/298] python3-nbxmpp: update to 1.0.1.

---
 srcpkgs/python3-nbxmpp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index 74727077391..b73a21dfe39 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=1.0.0
-revision=2
+version=1.0.1
+revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 #changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=8b7e967bc1d0f1a1f7cf3395b6f5d70009ae5607ad9afb8de32ff92b661693ad
+checksum=ca60c9bd1527fbeac305df90c670f11f2fe79f1304dad1efa0315f7484a34d43
 
 python-nbxmpp_package() {
 	build_style=meta

From cadec4c54cbb1b98059a22f79479acf3cf24366b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 24 Jul 2020 12:05:37 +0300
Subject: [PATCH 231/298] gajim: update to 1.2.1.

Closes #23805
---
 srcpkgs/gajim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index fe7cd0ba703..51d5ea67a6c 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,18 +1,18 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.2.0
+version=1.2.1
 revision=1
 archs=noarch
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools
  python3-precis-i18n python3-keyring python3-cssutils python3-packaging
- python3-css-parser"
+ python3-css-parser farstream"
 short_desc="Full featured Jabber/XMPP client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 #changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=fdd60e99ca374c28495a9313d1b162e9340bded98e952399e43af2a0ccfcd139
+checksum=c4faed4557296e4350bfea551c6743375dbaca3e1e7c5a3077321a10b10e8d1d
 nocross="gobject-introspection"

From a13be6764dd06d829553bde1734d0b4ce68501d2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 Aug 2020 16:22:05 +0200
Subject: [PATCH 232/298] New package: ugrep-2.5.0

---
 srcpkgs/ugrep/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/ugrep/template

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
new file mode 100644
index 00000000000..552865dd32a
--- /dev/null
+++ b/srcpkgs/ugrep/template
@@ -0,0 +1,13 @@
+# Template file for 'ugrep'
+pkgname=ugrep
+version=2.5.0
+revision=1
+build_style=gnu-configure
+configure_args="--disable-avx"
+makedepends="bzip2-devel liblz4-devel liblzma-devel pcre2-devel zlib-devel"
+short_desc="Ultra fast grep with interactive query UI"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/Genivia/ugrep"
+distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
+checksum=98cc23f27ec4ebba14d36f21b5625e0def4aab3e65afecc609e676938002b110

From 9b9185b8f1dcf540fad1f714d1185f6cf82e0389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 7 Jun 2020 02:11:25 -0300
Subject: [PATCH 233/298] wxPython4: update to 4.0.7.

- fix xlint
- update depends

[ci skip]
---
 srcpkgs/wxPython4/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index b65e0b2ffe1..4823b2e11cb 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,22 +1,21 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
-version=4.0.6
-revision=3
+version=4.0.7
+revision=1
 wrksrc="wxPython-${version}"
 build_style=python3-module
-pycompile_module="wx"
 make_build_args="--skip-build"
 make_install_args="--skip-build"
 hostmakedepends="pkg-config python3-setuptools python3-pathlib2"
 makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel webkit2gtk-devel
  gst-plugins-base1-devel"
-depends="python3"
+depends="python3 python3-six python3-numpy python3-Pillow"
 short_desc="WxWidgets GUI toolkit library (Python3 Bindings)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="custom:wxWindows"
 homepage="http://www.wxpython.org/"
 distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
-checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
+checksum=3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233
 
 if [ "$CROSS_BUILD" ]; then
 	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"

From d69a408777b4a03166817e31435a03e007aeb5ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 7 Jun 2020 02:11:57 -0300
Subject: [PATCH 234/298] kicad: switch to python3, add occt build_option.

- Move from wxPython to wxPython4.
- Move from python to python3.
- Fix wxWidgets config options.

- Add occt build option (not needed for now, occt can be built for all
archs).

- Add update file: without one, it couldn't find versions. Also ignore
development version *99*.

[ci skip]
---
 srcpkgs/kicad/template | 36 +++++++++++++++++-------------------
 srcpkgs/kicad/update   |  2 ++
 2 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/kicad/update

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 8368993a5e6..27b63ea8a58 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,36 +1,34 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.6
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
  -DKICAD_SCRIPTING_ACTION_MENU=ON  -DBUILD_GITHUB_PLUGIN=ON -DKICAD_USE_OCE=OFF
- -DKICAD_USE_OCC=ON -DKICAD_SPICE=$(vopt_if spice ON OFF)"
-hostmakedepends="pkg-config swig wxWidgets-gtk3-devel"
-makedepends="wxWidgets-gtk3-devel wxPython-devel python-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm occt-devel libgomp-devel
- $(vopt_if spice ngspice-devel)"
-depends="wxPython"
+ -DKICAD_SCRIPTING_PYTHON3=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON
+ -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+ -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
+hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
+makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
+ libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
+depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz"
 checksum=ac1a15e25a7ff0aca4b6224bdb2d3298081b43bedfad79470339d53d5e72beb0
-build_options="spice"
-build_options_default="spice"
+python_version=3
 
-CXXFLAGS="-std=c++17"
+build_options="spice occt"
+build_options_default="spice occt"
+desc_option_spice="Enable support for SPICE simulation"
+desc_option_occt="Enable support for 3D STEP models"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python wxPython"
-	configure_args+=" -DPYTHON_SITE_PACKAGE_PATH=${XBPS_CROSS_BASE}/${py2_sitelib}
-	 -DPYTHON_DEST=/${py2_sitelib}"
+	hostmakedepends+=" wxPython4"
+	configure_args+=" -DPYTHON_DEST=/${py3_sitelib}
+	-DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
 fi
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		CXXFLAGS+=" $(wx-config --cxxflags)"
-	fi
-}
diff --git a/srcpkgs/kicad/update b/srcpkgs/kicad/update
new file mode 100644
index 00000000000..2060b2060cb
--- /dev/null
+++ b/srcpkgs/kicad/update
@@ -0,0 +1,2 @@
+site="https://gitlab.com/kicad/code/kicad/-/tags"
+ignore="*99*"

From 83110269b9b79a112424f03c049650485188aaf6 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 2 Aug 2020 22:09:44 +0200
Subject: [PATCH 235/298] nsjail: orphaned

---
 srcpkgs/nsjail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index 81025a90a8a..8672653477a 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="bison flex pkg-config protobuf which"
 makedepends="libnl3-devel protobuf-devel"
 short_desc="Light-weight process isolation tool"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://nsjail.com"
 distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz

From 93d88e00508ed0d24b66fbf433ab606820c1824e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 2 Aug 2020 23:36:09 +0200
Subject: [PATCH 236/298] cross-mips-linux-musl: add --disable-symvers

---
 srcpkgs/cross-mips-linux-musl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index f2d5db391bd..bc8b15ac541 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.33
-revision=2
+revision=3
 short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -181,7 +181,6 @@ _gcc_build() {
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
-	_args+=" --enable-libssp"
 	_args+=" --disable-libsanitizer"
 	_args+=" --disable-multilib"
 	_args+=" --disable-nls"
@@ -189,7 +188,9 @@ _gcc_build() {
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
 	_args+=" --disable-libatomic"
+	_args+=" --enable-libssp"
 	_args+=" --enable-shared"
+	_args+=" --disable-symvers"
 	_args+=" ${_fpuflags}"
 
 	../gcc-${_gcc_version}/configure ${_args}

From 6df827290998834d912d68d7fb5e4c9608d12555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 2 Aug 2020 23:36:27 +0200
Subject: [PATCH 237/298] cross-mips-linux-muslhf: add --disable-symvers

---
 srcpkgs/cross-mips-linux-muslhf/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 26ba0c53d82..4f3bc67aa80 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.33
-revision=2
+revision=3
 short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)"
 maintainer="hipperson0 <hipperson0@gmail.com>"
 homepage="https://www.voidlinux.org/"
@@ -181,7 +181,6 @@ _gcc_build() {
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
-	_args+=" --enable-libssp"
 	_args+=" --disable-libsanitizer"
 	_args+=" --disable-multilib"
 	_args+=" --disable-nls"
@@ -189,7 +188,9 @@ _gcc_build() {
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
 	_args+=" --disable-libatomic"
+	_args+=" --enable-libssp"
 	_args+=" --enable-shared"
+	_args+=" --disable-symvers"
 	_args+=" ${_fpuflags}"
 
 	../gcc-${_gcc_version}/configure ${_args}

From 218518ab9274807d1740e936fb1fcffafda9f626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 2 Aug 2020 23:36:44 +0200
Subject: [PATCH 238/298] cross-mipsel-linux-musl: add --disable-symvers

---
 srcpkgs/cross-mipsel-linux-musl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index e64e54b40fa..48a0027d4eb 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.33
-revision=2
+revision=3
 short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -181,7 +181,6 @@ _gcc_build() {
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
-	_args+=" --enable-libssp"
 	_args+=" --disable-libsanitizer"
 	_args+=" --disable-multilib"
 	_args+=" --disable-nls"
@@ -189,7 +188,9 @@ _gcc_build() {
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
 	_args+=" --disable-libatomic"
+	_args+=" --enable-libssp"
 	_args+=" --enable-shared"
+	_args+=" --disable-symvers"
 	_args+=" ${_fpuflags}"
 
 	../gcc-${_gcc_version}/configure ${_args}

From 8027243fbe242a739c43a8fbe74927f550fd54d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 2 Aug 2020 23:37:03 +0200
Subject: [PATCH 239/298] cross-mipsel-linux-muslhf: add --disable-symvers

---
 srcpkgs/cross-mipsel-linux-muslhf/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 1fc72283888..e639bf043d7 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.33
-revision=2
+revision=3
 short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -181,7 +181,6 @@ _gcc_build() {
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
-	_args+=" --enable-libssp"
 	_args+=" --disable-libsanitizer"
 	_args+=" --disable-multilib"
 	_args+=" --disable-nls"
@@ -189,7 +188,9 @@ _gcc_build() {
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
 	_args+=" --disable-libatomic"
+	_args+=" --enable-libssp"
 	_args+=" --enable-shared"
+	_args+=" --disable-symvers"
 	_args+=" ${_fpuflags}"
 
 	../gcc-${_gcc_version}/configure ${_args}

From aba8412121c7c5bb06d62b37c1cbae27feb08885 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Wed, 22 Jul 2020 20:31:14 +1000
Subject: [PATCH 240/298] openjdk8: mips* support

Builds for all mips* platforms, using the zero backend. A mips port
properly is in process but has been "getting close to ready" for years
now, so we are using the much more tested zero backend.

mipshf had a branch jump error (mips hates super large branch jumps).
This is a known bug that is not going to be fixed very easily. To
workaround this, I reduced the jump by ~400 lines of assembly by
compiling with -Os, enough to make the jump close enough.

[ci skip]
---
 .../openjdk8/patches/104_mips-support.patch   | 69 +++++++++++++++++++
 srcpkgs/openjdk8/template                     | 10 ++-
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/openjdk8/patches/104_mips-support.patch

diff --git a/srcpkgs/openjdk8/patches/104_mips-support.patch b/srcpkgs/openjdk8/patches/104_mips-support.patch
new file mode 100644
index 00000000000..a788ea6df5b
--- /dev/null
+++ b/srcpkgs/openjdk8/patches/104_mips-support.patch
@@ -0,0 +1,69 @@
+# DP: Add support for zero architectures alpha, m68k, mips*, sh4
+
+Sourced from https://bazaar.launchpad.net/~openjdk/openjdk/openjdk8/view/head:/debian/patches/zero-architectures.diff
+
+--- openjdk/common/autoconf/platform.m4
++++ openjdk/common/autoconf/platform.m4
+@@ -54,6 +60,42 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
+       VAR_CPU_BITS=64
+       VAR_CPU_ENDIAN=little
+       ;;
++    mips)
++      VAR_CPU=mips
++      VAR_CPU_ARCH=mips
++      VAR_CPU_BITS=32
++      VAR_CPU_ENDIAN=big
++      ;;
++    mipsel)
++      VAR_CPU=mipsel
++      VAR_CPU_ARCH=mipsel
++      VAR_CPU_BITS=32
++      VAR_CPU_ENDIAN=little
++      ;;
++    mipsn32)
++      VAR_CPU=mipsn32
++      VAR_CPU_ARCH=mipsn32
++      VAR_CPU_BITS=32
++      VAR_CPU_ENDIAN=big
++      ;;
++    mipsn32el)
++      VAR_CPU=mipsn32el
++      VAR_CPU_ARCH=mipsn32el
++      VAR_CPU_BITS=32
++      VAR_CPU_ENDIAN=little
++      ;;
++    mips64)
++      VAR_CPU=mips64
++      VAR_CPU_ARCH=mips64
++      VAR_CPU_BITS=64
++      VAR_CPU_ENDIAN=big
++      ;;
++    mips64el)
++      VAR_CPU=mips64el
++      VAR_CPU_ARCH=mips64el
++      VAR_CPU_BITS=64
++      VAR_CPU_ENDIAN=little
++      ;;
+     powerpc)
+       VAR_CPU=ppc
+       VAR_CPU_ARCH=ppc
+@@ -373,6 +433,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
+ 
+   # ZERO_ARCHDEF is used to enable architecture-specific code
+   case "${OPENJDK_TARGET_CPU}" in
++    mips|mipsn32|mips64)  ZERO_ARCHDEF=MIPS ;;
++    mipsel|mipsn32el|mips64el)  ZERO_ARCHDEF=MIPSEL ;;
+     ppc)     ZERO_ARCHDEF=PPC32 ;;
+     ppc64)   ZERO_ARCHDEF=PPC64 ;;
+     s390*)   ZERO_ARCHDEF=S390  ;;
+--- openjdk/common/autoconf/flags.m4
++++ openjdk/common/autoconf/flags.m4
+@@ -827,6 +827,8 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAG
+     *)
+       ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
+   esac
++  # use the default for the package builds
++  ZERO_ARCHFLAG=""
+   FLAGS_COMPILER_CHECK_ARGUMENTS([$ZERO_ARCHFLAG], [], [ZERO_ARCHFLAG=""])
+   AC_SUBST(ZERO_ARCHFLAG)
+ 
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index ad1c3a23b6e..9f9c5998fdc 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -67,7 +67,7 @@ desc_option_docs="Build documentation"
 # no hotspot JIT for arm32 and ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	arm*|ppc*) _use_zero=yes ;;
+	arm*|ppc*|mips*) _use_zero=yes ;;
 esac
 
 # specifically do not enable docs because with zero it takes hours
@@ -185,12 +185,18 @@ do_configure() {
 	CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
 	CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}
 
-	# force ELFv2 for ppc64 just in case
 	case "$XBPS_TARGET_MACHINE" in
+		# force ELFv2 for ppc64 just in case
 		ppc64*)
 			CFLAGS+=" -DABI_ELFv2"
 			CXXFLAGS+=" -DABI_ELFv2"
 			;;
+		# with normal -O2 on mipshf there is a too-large jump which causes the
+		# assembler to fail. optimising for size means the jump is made smaller
+		mips*hf*)
+			CFLAGS+=" -Os"
+			CXXFLAGS+=" -Os"
+			;;
 	esac
 
 	configure_args=${configure_args/--with-libtool-sysroot=\/usr\/[a-z0-9]*-linux-[a-z]*/}

From 28733face01ae1c96d7b6bbf726973f2a00d3fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 31 May 2020 21:39:55 -0300
Subject: [PATCH 241/298] dracut: add UEFI bundle hook in dracut-uefi subpkg

Restricted to i686* and x86_64* for now.

Other changes:

- small formatting changes
- use relative path in kernel-hook-postrm
---
 srcpkgs/dracut-uefi                           |  1 +
 srcpkgs/dracut/files/dracut-uefi-hook.confd   | 19 +++++++++++
 srcpkgs/dracut/files/kernel-hook-postrm       |  4 +--
 .../dracut/files/kernel-uefi-hook-postinst    | 23 +++++++++++++
 srcpkgs/dracut/files/kernel-uefi-hook-postrm  | 17 ++++++++++
 srcpkgs/dracut/template                       | 34 ++++++++++++++++---
 6 files changed, 92 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/dracut-uefi
 create mode 100644 srcpkgs/dracut/files/dracut-uefi-hook.confd
 create mode 100644 srcpkgs/dracut/files/kernel-uefi-hook-postinst
 create mode 100644 srcpkgs/dracut/files/kernel-uefi-hook-postrm

diff --git a/srcpkgs/dracut-uefi b/srcpkgs/dracut-uefi
new file mode 120000
index 00000000000..b3ae25a9bdd
--- /dev/null
+++ b/srcpkgs/dracut-uefi
@@ -0,0 +1 @@
+dracut
\ No newline at end of file
diff --git a/srcpkgs/dracut/files/dracut-uefi-hook.confd b/srcpkgs/dracut/files/dracut-uefi-hook.confd
new file mode 100644
index 00000000000..50647c483a9
--- /dev/null
+++ b/srcpkgs/dracut/files/dracut-uefi-hook.confd
@@ -0,0 +1,19 @@
+# Options for the dracut-uefi kernel hook script installed by the dracut package.
+
+# To enable EFI bundle creation in dracut, uncomment
+#CREATE_UEFI_BUNDLES=yes
+# This requires an EFI stub, provided by the gummiboot package,
+# as well as setting the kernel command line.
+# Booting without a kernel command line is unsupported.
+
+# You can set the kernel command line with
+#KERNEL_CMDLINE="loglevel=4 slub_debug=P page_poison=1"
+# or by setting kernel_cmdline in a dracut.conf(5) file.
+# The bundle can also use the command line from a bootloader / boot manager
+# if Secure Boot is disabled.
+
+# You can set command line options for the dracut command
+#DRACUT_OPTIONS=
+
+# Output directory for the EFI bundle
+#UEFI_BUNDLE_DIR="boot/efi/EFI/void/"
diff --git a/srcpkgs/dracut/files/kernel-hook-postrm b/srcpkgs/dracut/files/kernel-hook-postrm
index f35d076193b..f99458a4bfa 100644
--- a/srcpkgs/dracut/files/kernel-hook-postrm
+++ b/srcpkgs/dracut/files/kernel-hook-postrm
@@ -7,7 +7,7 @@
 PKGNAME="$1"
 VERSION="$2"
 
-if [ -f /boot/initramfs-${VERSION}.img ]; then
-	rm -f /boot/initramfs-${VERSION}.img
+if [ -f boot/initramfs-${VERSION}.img ]; then
+	rm -f boot/initramfs-${VERSION}.img
 fi
 exit $?
diff --git a/srcpkgs/dracut/files/kernel-uefi-hook-postinst b/srcpkgs/dracut/files/kernel-uefi-hook-postinst
new file mode 100644
index 00000000000..d623c3f86df
--- /dev/null
+++ b/srcpkgs/dracut/files/kernel-uefi-hook-postinst
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# Kernel post-install hook for dracut EFI bundle.
+#
+# Arguments passed to this script: $1 pkgname, $2 version.
+#
+PKGNAME="$1"
+VERSION="$2"
+
+. "${ROOTDIR}/etc/default/dracut-uefi-hook"
+if [ -z "${CREATE_UEFI_BUNDLES}" ]; then
+	exit 0
+fi
+
+if [ ! -x bin/dracut ]; then
+	exit 0
+fi
+
+mkdir -p ${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}
+
+dracut -q --force ${KERNEL_CMDLINE:+--kernel-cmdline="${KERNEL_CMDLINE}"} ${DRACUT_OPTIONS} \
+	--uefi ${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi ${VERSION}
+exit $?
diff --git a/srcpkgs/dracut/files/kernel-uefi-hook-postrm b/srcpkgs/dracut/files/kernel-uefi-hook-postrm
new file mode 100644
index 00000000000..8183bb26f08
--- /dev/null
+++ b/srcpkgs/dracut/files/kernel-uefi-hook-postrm
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# Kernel post-remove hook for dracut EFI bundle.
+#
+# Arguments passed to this script: $1 pkgname, $2 version.
+#
+PKGNAME="$1"
+VERSION="$2"
+
+. "${ROOTDIR}/etc/default/dracut-uefi-hook"
+
+: "${UEFI_BUNDLE_DIR:=boot/efi/EFI/void}"
+
+if [ -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi" ]; then
+	rm -fv "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi"
+fi
+exit $?
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index b11335d06e3..5dad17021f3 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=050
-revision=3
+revision=4
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -14,10 +14,11 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
 distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
 checksum=f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333
+subpackages="dracut-network"
 
 make_dirs="
-	/etc/dracut.conf.d 0755 root root
-	/usr/lib/dracut/dracut.conf.d 0755 root root"
+ /etc/dracut.conf.d 0755 root root
+ /usr/lib/dracut/dracut.conf.d 0755 root root"
 
 case "$XBPS_TARGET_MACHINE" in
 *-musl) # Add musl-fts implementation
@@ -25,6 +26,13 @@ case "$XBPS_TARGET_MACHINE" in
 	;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*) # archs supported by dracut for EFI bundle
+		_efi_bundle=1
+		subpackages+=" dracut-uefi"
+	;;
+esac
+
 do_build() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl) make ${makejobs} LDLIBS="-lfts" ;;
@@ -40,6 +48,13 @@ post_install() {
 	# kernel hooks.
 	vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 20-dracut
 	vinstall ${FILESDIR}/kernel-hook-postrm 755 etc/kernel.d/post-remove 20-dracut
+
+	if [ "${_efi_bundle}" ]; then
+		vinstall ${FILESDIR}/dracut-uefi-hook.confd 644 etc/default dracut-uefi-hook
+		vinstall ${FILESDIR}/kernel-uefi-hook-postinst 755 etc/kernel.d/post-install 20-dracut-uefi
+		vinstall ${FILESDIR}/kernel-uefi-hook-postrm 755 etc/kernel.d/post-remove 20-dracut-uefi
+	fi
+
 	# We don't need the systemd stuff.
 	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*systemd*
 	rm -f ${DESTDIR}/usr/share/man/man8/*.service.*
@@ -52,8 +67,19 @@ dracut-network_package() {
 	archs=noarch
 	pkg_install() {
 		for f in 40network 90livenet 95fcoe 95iscsi \
-		    95nbd 95nfs 95zfcp 95znet; do
+			95nbd 95nfs 95zfcp 95znet; do
 			vmove usr/lib/dracut/modules.d/${f}
 		done
 	}
 }
+
+dracut-uefi_package() {
+	depends="binutils gummiboot dracut-${version}_${revision}"
+	short_desc+=" - UEFI bundle hook"
+	conf_files="/etc/default/dracut-uefi-hook"
+	pkg_install() {
+		vmove etc/kernel.d/post-install/20-dracut-uefi
+		vmove etc/kernel.d/post-remove/20-dracut-uefi
+		vmove etc/default/dracut-uefi-hook
+	}
+}

From 7a5cf2b18dda8158598c0bef974df6eb575a0a73 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 3 Aug 2020 07:44:15 +0200
Subject: [PATCH 242/298] fio: switch to python3

---
 srcpkgs/fio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index c9244580e71..6fbabefb02d 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -1,20 +1,20 @@
 # Template file for 'fio'
 pkgname=fio
 version=3.21
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 make_build_args="T_TEST_PROGS="
 make_install_args="mandir=/usr/share/man"
 makedepends="zlib-devel libaio-devel"
-depends="python"
+depends="python3"
 short_desc="Flexible I/O tester"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/axboe/fio"
 distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
 checksum=22262808730f38ddd515d9f2f43b08ec31ad89f3e8c84645e8ce46b1b01f345d
-python_version=2 #unverified
+python_version=3
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel"

From 7dcd263b837939ae0ae024705fdbafdf4f0e80b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 3 Aug 2020 02:52:14 -0300
Subject: [PATCH 243/298] gummiboot: adopt.

---
 srcpkgs/gummiboot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template
index 80e2ec17e86..a824e27c021 100644
--- a/srcpkgs/gummiboot/template
+++ b/srcpkgs/gummiboot/template
@@ -8,7 +8,7 @@ conf_files="/etc/default/gummiboot"
 hostmakedepends="automake pkg-config libxslt docbook-xsl"
 makedepends="gnu-efi-libs liblzma-devel libblkid-devel"
 short_desc="Simple UEFI Boot Manager"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.0-or-later"
 # Homepage is long dead and the project has an unofficial release under Alpine
 # homepage="http://freedesktop.org/wiki/Software/gummiboot"

From 58a5589becd1858875f552727b1b3788ac9f8d9e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 3 Aug 2020 15:15:13 +0200
Subject: [PATCH 244/298] New package: sasm-3.11.1

---
 .../patches/dont-install-vendores-binaries.patch   | 12 ++++++++++++
 srcpkgs/sasm/template                              | 14 ++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/sasm/patches/dont-install-vendores-binaries.patch
 create mode 100644 srcpkgs/sasm/template

diff --git a/srcpkgs/sasm/patches/dont-install-vendores-binaries.patch b/srcpkgs/sasm/patches/dont-install-vendores-binaries.patch
new file mode 100644
index 00000000000..62797d99456
--- /dev/null
+++ b/srcpkgs/sasm/patches/dont-install-vendores-binaries.patch
@@ -0,0 +1,12 @@
+reason: Linux/bin/ vendors {listing,fasm} binaries, statically linked for i386
+
+--- SASM.pro
++++ SASM.pro
+@@ -31,7 +31,6 @@
+     docfiles.path = $$DATADIR/doc/sasm/
+ } else {
+     binfile.files += sasm
+-    binfile.files += Linux/bin/*
+     binfile.path = $$BINDIR
+     data.files += Linux/share/sasm/*
+     data.path = $$DATADIR/sasm/
diff --git a/srcpkgs/sasm/template b/srcpkgs/sasm/template
new file mode 100644
index 00000000000..6438696a1c7
--- /dev/null
+++ b/srcpkgs/sasm/template
@@ -0,0 +1,14 @@
+# Template file for 'sasm'
+pkgname=sasm
+version=3.11.1
+revision=1
+wrksrc=SASM-${version}
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-devel"
+short_desc="Crossplatform IDE for NASM, MASM, GAS and FASM assembly languages"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-3.0-or-later"
+homepage="http://dman95.github.io/SASM/"
+distfiles="https://github.com/Dman95/SASM/archive/v${version}.tar.gz"
+checksum=3f508f2a790815aca4e742be1e1200aea1d25f6f73309ce824d5ccef49af26b1

From befee6eef416bcafb7a15fa19ec48303dbe53b89 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 3 Aug 2020 15:40:03 +0200
Subject: [PATCH 245/298] lua54: avoid conditional usage of -Os

The CMCFLAGS variable in Lua 5.4's Makefile specifies -Os by
default, apparently to shrink the code size of certain files.
However, at least on my machine that causes issues with valgrind,
rendering it practically unusable through hundreds of messages
about uninitialized memory.
---
 srcpkgs/lua54/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua54/template b/srcpkgs/lua54/template
index a3792ec83bc..b77c8ce052a 100644
--- a/srcpkgs/lua54/template
+++ b/srcpkgs/lua54/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54'
 pkgname=lua54
 version=5.4.0
-revision=1
+revision=2
 wrksrc=lua-${version}
 makedepends="ncurses-devel readline-devel"
 short_desc="Powerful, fast, lightweight, embeddable scripting language (5.4.x)"
@@ -24,7 +24,7 @@ do_build() {
 		-e '/^LUA_(SO|A|T)=/ s;lua;lua5.4;' \
 		-e '/^LUAC_T=/ s;luac;luac5.4;'
 	make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" \
-		CC="$CC" RANLIB="$RANLIB" \
+		CMCFLAGS="" CC="$CC" RANLIB="$RANLIB" \
 		INSTALL_DATA="cp -d" LUA_SO=liblua5.4.so ${makejobs} linux-readline
 }
 

From 067e1f50c052925b0f2ffdcbcbcf3bc3646bebda Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 2 Aug 2020 00:32:47 +0400
Subject: [PATCH 246/298] calibre: update to 4.22.0.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 3f72bc5613b..55b9fb16bc2 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=4.21.0
+version=4.22.0
 revision=1
 build_style=python2-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -25,7 +25,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=aa0cb9d5f3cbc85735f8c13bea1ec1268ba4bf00816f621b0385ab011c99e8c3
+checksum=51f52b7015c4d9b456d0d5e8efacfffe564709552f0a635ae8174d1947ab1c34
 nocross=yes
 
 do_configure() {

From baee2658f343ea858e6410dbdeedbfc8f268e09b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 3 Aug 2020 16:27:42 +0200
Subject: [PATCH 247/298] oracle-jdk: remove

Closes: #23881
---
 srcpkgs/oracle-jdk/INSTALL                    |  35 -----
 srcpkgs/oracle-jdk/INSTALL.msg                |  11 --
 srcpkgs/oracle-jdk/REMOVE                     |   7 -
 .../files/java-policy-settings.desktop        |   9 --
 .../oracle-jdk/files/oracle-jdk-128x128.png   | Bin 7847 -> 0 bytes
 srcpkgs/oracle-jdk/files/oracle-jdk-16x16.png | Bin 748 -> 0 bytes
 srcpkgs/oracle-jdk/files/oracle-jdk-20x20.png | Bin 881 -> 0 bytes
 srcpkgs/oracle-jdk/files/oracle-jdk-22x22.png | Bin 973 -> 0 bytes
 srcpkgs/oracle-jdk/files/oracle-jdk-24x24.png | Bin 1014 -> 0 bytes
 .../oracle-jdk/files/oracle-jdk-256x256.png   | Bin 16734 -> 0 bytes
 srcpkgs/oracle-jdk/files/oracle-jdk-32x32.png | Bin 1373 -> 0 bytes
 srcpkgs/oracle-jdk/files/oracle-jdk-40x40.png | Bin 1908 -> 0 bytes
 srcpkgs/oracle-jdk/files/oracle-jdk-48x48.png | Bin 2368 -> 0 bytes
 .../oracle-jdk/files/oracle-jdk-512x512.png   | Bin 38917 -> 0 bytes
 srcpkgs/oracle-jdk/files/oracle-jdk-64x64.png | Bin 3376 -> 0 bytes
 srcpkgs/oracle-jdk/files/oracle-jdk-72x72.png | Bin 3904 -> 0 bytes
 srcpkgs/oracle-jdk/files/oracle-jdk-96x96.png | Bin 5532 -> 0 bytes
 .../oracle-jdk/files/oracle-jdk-vars.sh.in    |   1 -
 srcpkgs/oracle-jdk/files/oracle-jdk.sh        |   1 -
 srcpkgs/oracle-jdk/template                   | 138 ------------------
 srcpkgs/oracle-jdk/update                     |   1 -
 21 files changed, 203 deletions(-)
 delete mode 100644 srcpkgs/oracle-jdk/INSTALL
 delete mode 100644 srcpkgs/oracle-jdk/INSTALL.msg
 delete mode 100644 srcpkgs/oracle-jdk/REMOVE
 delete mode 100644 srcpkgs/oracle-jdk/files/java-policy-settings.desktop
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-128x128.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-16x16.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-20x20.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-22x22.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-24x24.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-256x256.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-32x32.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-40x40.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-48x48.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-512x512.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-64x64.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-72x72.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-96x96.png
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk-vars.sh.in
 delete mode 100644 srcpkgs/oracle-jdk/files/oracle-jdk.sh
 delete mode 100644 srcpkgs/oracle-jdk/template
 delete mode 100644 srcpkgs/oracle-jdk/update

diff --git a/srcpkgs/oracle-jdk/INSTALL b/srcpkgs/oracle-jdk/INSTALL
deleted file mode 100644
index e313a7614cb..00000000000
--- a/srcpkgs/oracle-jdk/INSTALL
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This script will install the actual plugin, advise the user to read the
-# license for Oracle JDK and to re-login to have environment variables set
-# properly.
-#
-
-BUILD_DIR="./var/tmp/${PKGNAME}-${VERSION}.build"
-
-do_install() {
-	mkdir -p "$BUILD_DIR"
-	wget \
-		--no-check-certificate \
-		--header "Cookie: oraclelicense=accept-securebackup-cookie" \
-		--progress=bar:force \
-		-c -O $BUILD_DIR/jdk.tar.gz \
-		$ORACLE_JDK_URL
-	echo "$ORACLE_JDK_CHECKSUM  $BUILD_DIR/jdk.tar.gz" | sha256sum -c || return 1
-	tar xf ${BUILD_DIR}/jdk.tar.gz || return 1
-
-	if [ -d usr/lib/jvm/jdk$ORACLE_JDK_LONG_VERSION ]; then
-		rm -rf usr/lib/jvm/jdk$ORACLE_JDK_LONG_VERSION
-	fi
-	mv jdk$ORACLE_JDK_LONG_VERSION usr/lib/jvm/jdk$ORACLE_JDK_LONG_VERSION || return 1
-}
-
-case "${ACTION}" in
-post)
-	. usr/lib/jvm/oracle-jdk-vars.sh
-	do_install
-	RESULT=$?
-	rm -r $BUILD_DIR
-	[ $RESULT -ne 0 ] && exit $RESULT
-    	;;
-esac
-
diff --git a/srcpkgs/oracle-jdk/INSTALL.msg b/srcpkgs/oracle-jdk/INSTALL.msg
deleted file mode 100644
index 60b1827555f..00000000000
--- a/srcpkgs/oracle-jdk/INSTALL.msg
+++ /dev/null
@@ -1,11 +0,0 @@
-- The Oracle JDK package is licensed software.
-
-	You MUST read and agree to the license stored in
-	/usr/share/licenses/oracle-jdk/LICENSE
-	before using it.
-
-- Please re-login to update PATH and JAVA_HOME or re-source
-  /etc/profile:
-
-	$ source /etc/profile
-
diff --git a/srcpkgs/oracle-jdk/REMOVE b/srcpkgs/oracle-jdk/REMOVE
deleted file mode 100644
index c9e64cd87ad..00000000000
--- a/srcpkgs/oracle-jdk/REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-case "$ACTION" in
-pre)
-	. usr/lib/jvm/oracle-jdk-vars.sh
-	rm -rf usr/lib/jvm/jdk$ORACLE_JDK_LONG_VERSION
-	rm -r usr/lib/jvm/$PKGNAME
-	;;
-esac
diff --git a/srcpkgs/oracle-jdk/files/java-policy-settings.desktop b/srcpkgs/oracle-jdk/files/java-policy-settings.desktop
deleted file mode 100644
index 621b7ad7cf8..00000000000
--- a/srcpkgs/oracle-jdk/files/java-policy-settings.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/oracle-jdk/bin/policytool
-Icon=oracle-java.png
-Name=Java Policy Settings
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-128x128.png b/srcpkgs/oracle-jdk/files/oracle-jdk-128x128.png
deleted file mode 100644
index ce5ed56646e88d6c87e1a0c62287eb6ee9ab7098..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7847
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
B4cY(z

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-16x16.png b/srcpkgs/oracle-jdk/files/oracle-jdk-16x16.png
deleted file mode 100644
index fd3d59bdac0a577d36439a3b3b6420e726980339..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 748
zcmZ`$TS${(82;1@b(!6WDFk6DN+`d>PD4c3mP#rfRwP}txlIvM=bSDhYIq0&$qrrw
zO4*%Mh%-|&G1)Zpn7TQghs`<N)VVdCbKC!a|F?cGyXb}IeRyBqhxhb6Cp#@TC?W^|
z5S)?D%A@$qF#`N39}^dnPtl3u)T~qh<jpk5^QYqT{Pesm03JmHAZq{sr&6+Q0ID$n
zcDVpB-U1LNY8%K+0>CFaCzHeWQbxGZ9|O6&L>i|^(>yWRPHxS5aVNQ}#Yf%{lkZ83
z*6T&&<_uJKc?O;$+d3o>^tg~^3C@2a^&=2@4_zLFyf^`sbE|W!o5mgM#)e_byzO-3
zqpCIQ{-Jr#J~X2pQ|rbSbeeVZfz$PS#dze#6>}@SW9q(N>P3T@fFy~~wAQeoHw{fM
z{g}}%8+Z2XhX|ofi+x<9|EXFVRjp2F^g7etajiv*JPsTp7Y>iygv$eQNJ5<wYI;b$
z5?Pi><0M@E?j;GR`GOBO;mVi9RJ-Tf6Le%F#@ld3Gh80T2OHp0A3pLLx$MY&K+JZa
z1G5);kYgJ;t<>Js4XyW+%P8_Gyp_h{b$4Yxqk=$DdO;QSn#E)IFk@ODQpvUqRx0PL
ziqDn#-i$uU8J?<}C>HX~DW)oMrNbUcv+vUaA{~tlY}V*V)J5Lo*pl#q>$U#usQw^f
z=<UnZ!C7(rvX<T#o$p$bn@YJI<$?!=9|c7q6zjvfd%ExR$iLRd%B3QSxTdo4o?_T)
zvKe-wOjf@zyVK#Ki9$}*9n{v7Or}zCp+EA2Z|+<|LendG<$hqwX>bD%js83t97xR>
zC1Kx{2zU}9gD)0R1n5{oVjOlQj!x%b7$fl-gMRfAMrUAH(Ydage*|R}f|8=z{|mxW
w0wyRy_;H8)iXw@WCl&&!R2pAWURuTHiG=YL;^J0YQUp~5GT7OyPA0eRFNpb-JOBUy

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-20x20.png b/srcpkgs/oracle-jdk/files/oracle-jdk-20x20.png
deleted file mode 100644
index afdcbe6ee6bae6d0a0eee16a862d35457f932121..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 881
zcmZ`$ZA?>V6n=4=VW^8yGgcE5WRvKOc-IhT8Z)65X_Yor*akAU)(VbH2ZOq9i$4%q
zVn-IlY$}2%@Wa&131jF`iqKl1Ur;{!MfvE5K+(1cTIs#-d+*)L&;8hsbDlgW=Q$_m
zJZh;VYhA+T1OUJ~kx+0H<EE8}e*@=-pNIEjc=J?-I0JyTnl(uN7UoF`;ZZRFKcxUr
zQ3U{nOBF!?&JqATlL5fH20&tI!^0!{0EkmbvvV_9mSrM77Lmw#pQWNK4Uw}0xjR{g
zX5lilw!new$fKo09yoNH>c0w&4QN^q2kOwYfowfP2Q18j4^8QzrJ3rgT6h`t1;ejn
z6djGA&}3{vM<F`06djwIAt5rmylwhntJ^m`F*D-vJEmvn7nUHRTlKcN(4yAr>K~gj
zj85uDCT5<$=rlQchsJwt;}(}M8Y7oUie{Mk$kNki3!%kVokqK++oI80Vt6i1FO!gA
z7_G(Cs<Rm#(}UywAx~h??RWcw49iAily@#{^90OJugU2h8uz>W!SGU)VOV<B#zef(
zbOYJj(PR(ubklRA%;GFP@1TQrI$*}{fu=^}XeZm1l;JmMzDen7;K*I_@3TzoB{bin
zda9|uD`bZXx&I;Wou(eE$@X$)`2{pLLSsFe>_wg~CK_fD#nOnyD`5<qa_wRm+XLcG
z9L^G)8@`|P6((<&3iHdc*UpuQ<8QD30T*o|K}PO-qY7C%IGD0}ZO;=+<<>q^-{6z;
zDSbwRRbQPt(7!wBVpD-IPq68LH2Vww2C?wav4fvUzRWlx;)tY~pNfwk$T?h)m6)&j
zrLp^bQ*-V0J%8P*ZBuLNI)C1F`O@zlzuvu}RbOb?$hWu+cI$DmRi9&BBYO0p=HAW6
z1?e(rX*{1uTf1G((N(O{y`S9DtT+*H`8TewREuhjJ2b_M^PIZ)-akSO6J2Q4Cr!HK
zDw*WFcT{<z;(W=w$qm(qOglg1?A>tZ&epgDFqZv+{q)y$VSL**WoDl8q+D6ZQ<N2A
z09@juv|YrWU0iN1LGaS{^0*)GB)B|+DB9Bc{eJ{!N=_CR{rLZa#PoO*7I0QJ<dhUC
nRr0bzpi-$)i@*J*Tp=$lOf4xpRUg^688-n@rbO^3Usm}qmIUq?

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-22x22.png b/srcpkgs/oracle-jdk/files/oracle-jdk-22x22.png
deleted file mode 100644
index d8729408f8231ac2896ae2a71c40880cfd95600a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 973
zcmZ`%ZA?>V6n<edQNbnt*aS?B!)Q<@DM*Oxh#91f1(8@~%hY9|K*7=p4OS6dl&p0h
z;sWWmtXrKJ35rx4@+B=FW6X}WK$WjT`7X9lE&_#edwcKu-g|fXxgSf;bDo?h=gG;*
zIp3d3KfYso#C8C{juesLG{^64V(VL6_T}H*#?jk(Nhgy4cvc>QBwM(8Z?@?4NdT@L
z0H9P20L4kA9sn-$0KhT<;A;WcrMPPpCjt;ue=03Q$g(W6=4MDAnrLU%=4sC`wBBQ3
zfRoXziR$=<p0m=P5thQyWG893f$WX2?*ZdmWNAn?U8bF8+SL#Ht7x~4Y`Q|d&@h}6
zU!iAv$OZ)q35H=Qh#*1(ldh4O`3-_337lA6Sf72ljuZX>)$ec;BxSVPt@fGTG3U_q
zybD_$on2@&4U!NUtoA=`4%5)oi^0kEzEP)V**r3ht@_627CUW@p5bYmV{UDO2vCq_
zn3Z*W%Dq%=v{ttKbFbO-q|3Ivj=Pt<+GpK=y&9izVUsS*KD#jK#>QVSdVPL~=q2yQ
z#A~drchq1R>F6K(dthP>Cs>AN{mVE(dN=&u4Z`OSkQ8G4D^$ChCA=(6u{2@>K86eY
z4K)8ob(h0eHE70!#-780TB=<|FASmK`oNPsXsf0=zoVTNG}Q$M>qx^**ms|-FQ8qv
zfIf$8E=Kkys^b<M)HBP|WJ?JeYlRjaeEE>Um*LP;W_6D0`2~%)q0wfRVYq9a3Ap1q
z3d%ZhTu_b&t4OZcrVyRI#68LACW4ZqbXPgimm)~Y2ph`I{5bedTId)!5|SYPG~voS
zY2x&lf<0e^ijUn0N_sz3EZHgE8T-M3vJ;|I$?eo$^KGjoIx2Nv$f1M!n%c+m3;8nr
z-jF2^hAql>haCzFuhL4g@^cF$vTE5yRenp|?}iRl)sK-4+QzbndR^PMk9MgvM>O@%
z%m1jnSt`CSuMqPz3eg3vuvMlm$oZ)#UZY6+GEMZk@~h-5O>l$5a?tYljVyLi7XGWb
z`)uR`$A^XzlH77D(cG;On)X*qrS5kle~zlv*UIyku-&Z@x(c=K{JDwokND9>qp7Sy
zef?TE)ph4s4FH0=*ge-hkAC3R->(#Yrp%EjrTpw7DMuiV7aM<=mvA^PE`!J8#~<a#
z9gXJ2@p-(8Pr54qW4KtDBg-xMe}i-D)qR{Hd~?E?!dzvsq(};ii;H7q1@cST5`{FT
WuqaQrk{H1?ffQl7;AwK^*Z%@NelW5C

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-24x24.png b/srcpkgs/oracle-jdk/files/oracle-jdk-24x24.png
deleted file mode 100644
index 70a59d78b7371a61a9a7231c58a7c9f2b0875068..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1014
zcmZ`%YfMvT82*S>6vlpRV+iW9NkJWfbVZGH&J5QM7?*TX42*4|LQy2#uhp11!z4Q5
z#6^d~=H`&d#cpNb7;MUDp<1L|3Y5}vD^{Si1qyA?`OZ1t+2QAY?8oywdEUHF-sFAX
zE5d{*AFlu}0Dw<SH2(ynJ2$a?3&Xm`0W~9APe;Z_0wDj^n-sGc|8{!xiFg3c1p{!g
z0szRAE-nI4!U4dN1^}-H0KfdY&QFg5;L$6L6A5UVMjOk>X`|-*sRb=^t-#)!$guz)
zSCaZa(fSf{*^zY$Z!aZATF7Yy4c#>1##;->F*%{SO$<Fi?p0i#hgRmWMlm_wMw!%v
z`Uk8&8DVP(AxKaNx{-Mht(aiPdE~Srnszwd8*coib@kVtA?=iTW!>f2aM`VvrMZa(
z+nUpjKm13tWOw}aT-QA~`D}bft(zUtn?`3AOiOl1kQgNHbv#{OU2o~uJkjVC!-hwy
z(ILY;4vAso3+=QSA)2Hp<%m%=Hf>wmaAA;v8;7^$J+-Zh8is#YPMMb}3U&4C8oJbW
zhjZRy*P9k6=a*hsR%RD%6hd>0wzfWPTi-}~pSE44?RYlUGi(^2T_8x(Xtq%1L2|l>
z7;1!y>(sJ=)IFjsddg}<wi#l$2`Z{7^AMrA5BqKr&+idh8S(TE-c~{r80@)5PW(Zr
zYOuyM((pIlRt&o?k;W(F=x<Q@9oC$I@O8Z70xmmCj>@rS39`>(O{XZc277o0DsK=2
zzmWP)8oG$#X43GOCO1#)<SINF@i-M5#lKaZ6%xUi9r@8IMa<{uHsNu6e{DI_;2Fb@
z6zv~OPy29NRop8R9^u}l1t$-ewwSED>pnLoE2ZT)hOs!ktgkBse7Qe6IP9GRRbyTU
zviwsb;>1#xAV}hybg0BfR1hDUv*(KsE^PTIK5)+)JJMfI3@`GI4awe>x<wRP>U#BB
zLxLtumTQ0T+FP<8zkDg19zS;GBmt$+bL%!%ct_<=(G{0jl~MeU1qOfBPUYTMr8Gjh
zj~yHlR9j!)@N+<Bj-TId-<!F<_OJHVRbL6b+}c`HxbE;zDoQT&7P7s*xf)yXNxwRz
zUh;0UklmDhcG<Ekp!QDcX9gjA@_k-cXX^QLgqjet;lBK<33bZ5DM`nqY7x6&{LLy6
z0QbL-I8+ndn8@rYs92C(oFOij@X`w<i~ug@y@R2g!=YTRh{NF>Ji_B13E^;g9M1Km
z?z{g9<m6>!WlH})Ft@!tkO}y2PDsqlEG`olN<djzSy)zXc2T-GUlNvAc)HepG=OOW
NF@glX?0DLxe*wx;IK=<}

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-256x256.png b/srcpkgs/oracle-jdk/files/oracle-jdk-256x256.png
deleted file mode 100644
index 59b568fb25cf05d52204f0e9e442fd5f6cd21c45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16734
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

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-32x32.png b/srcpkgs/oracle-jdk/files/oracle-jdk-32x32.png
deleted file mode 100644
index 29441b4604707d38e17b2f7a55890babc21fc211..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1373
zcmZ`%X;4!K5Pm2`6tOcp9Xv*+*1<YbZA3&wr!5*zfe}$Wpe-Z<ML|vhtwm9k3V4)J
zfpW{O7(oRM#F(HEAQ1?JKmr6g5+DglNJ8@N^zpMlx-+}q?D5U+&hFjg0baIiHm?By
zz}Cl`a)Q8bmeqPCVJTJFodj4$x%;~VK+^*oG~8-AN%KD84**wp0Kkn*0Dy_mjX40g
zOa=f&7y!5x0DxV5ackgV09bMTxZg<+Ga)#RYiG<Df)2gHmsB{YgV{N_QH}7*;m&+B
z3L)La(90Oypfn>U+@ytDGr)!@Of`y1IjHa@z9_>@i%?TM)D(xSzaZQ~99%?tN=+rc
zxPBh#Dun14%?JoHZ$a;_f%W0oBo}H)Govuve&3k;JvP~8#xbP79-a7v>*h?wKG5qV
z+-!ys6vZ%vTVR4<g+>p-2r;Hqu59IrgcEXu2{Pj-Dic5k4G1Axz47C~SXFDc5riNF
zt!eAYtY~TaC}`~wwef}--9wC?AtryMM>JssVGP4nT7zJ0TBg*<RoZ#AZeh`&TQV7p
zAcA6jlBxVg&h)%Gx3;a4(fxwc+xW4+;X`lvTkaz|n=6!#&M27tVb!8xMycTqe`yzt
ze&`i{8W<Cd&CDn?>^^bHn+{g5m^&mLmnoY*3Gy0PSyk`uRx=73+ckRQ+b&^hKAqhs
zSu~iIKuB){m0JDOyn1k4#`-)`|DIpV<kh|B*R%M~Sf3l%y)9f}$G}*};8?GCYGi7z
zTQt!*INshr%ITAE`Xy4i3WO2jgcy!5nTXX<d_jsYEnsqismK$X8^SeHW(+mMMock`
zsm5T=edz5~ure4GGvKzH$mdF^IR)XBfi)pWR}rqAhTdETpV7dlLD)<$uA2pGf5B#j
zFf$Wsy@4qurcytozYf<c;Eu--BORh&0Bb@`g-4OTT5OtUD)q;{bV9F_p~g#a=M#iq
zVJh;*W(UC+(NJ?L%*ujZC79tQGh~3<AK<ES;yK+cHCY5$P>*?0gsa<ZZWGSxc<-}G
z#Lo{etHqI>MQKFA8y|}MNmm{%?B`Xve*Cqdg^gqS6_=ECOkHkqXqt?1B@F@(ZcOO0
zv0k$}=dbL^M|SxSA5rt4aAGqWikUZ`uD7?_`J7zmOP&fWuc24eSKsr>xKA%-Wo!$G
z-cH+)9-AH=L?Z1=vhj;P=6G>S2<edRAFD#VzKgOuz1HfI+P?Hxspv;mIv%jr!algb
z(~@MBm3im37sYcgnZg~RCLE0ky>^6pBGLDm&$+847q4@XkrA^qa@i`1hb7hI=^h@K
zK#!uj26xw?dDi-YSGsK9m%B(L8^5^VVPT}Guuv=!9dLH3-hY64CT}8dL?IPP1>(me
z;{$`ESq@bji(zDkAHT$zk<yb{KS(~mX@AW=KH24Y+1WT3-uj~LQP26|Y#Vv+23pC7
zux%6H-Z>bvA}9a%uw4&Bn8{+@*N&(Cf7{*a8L{BzXGNmMC=WD*HV0lGlzW7{Yq=2i
zPh%`%lpRV@OWt4Zlm3Z(6;Ina(j0lPtUUXUf>V9SHpTv2PQ@4P-<2T`w*JJ4*9oID
z_GL$%>VMJinp#?TYrfrz<gjilsm03fhXAi2cEY?<ie@F?Ai1{1E8<=Taa4z7k2A^V
z!;>T2Xo(R708Zq+&b!GjyPcd)lF4q)u5M1Qj$|h{GWp>tcG-Ujv2o|4Bd`2FVbVHn
yJ3-jA+#x6~GC4IoF#<?UP2CfH>0%NsJU(JiTw+v_`tW9=2=MU;pwN$m-TW8HBPL$}

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-40x40.png b/srcpkgs/oracle-jdk/files/oracle-jdk-40x40.png
deleted file mode 100644
index 789bb3cc8cd3b131eac611f157890ca7a265b251..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1908
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

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-48x48.png b/srcpkgs/oracle-jdk/files/oracle-jdk-48x48.png
deleted file mode 100644
index c3b3cce4ab64fff9c2637b18f36f3c366b884ca1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2368
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

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-512x512.png b/srcpkgs/oracle-jdk/files/oracle-jdk-512x512.png
deleted file mode 100644
index f9129d1a7ffbb374cf4247e3e86e7b56521e96f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38917
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
CK?Py}

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-64x64.png b/srcpkgs/oracle-jdk/files/oracle-jdk-64x64.png
deleted file mode 100644
index 79618c3c9c5beb20d5b22acc75443a0cba401ce7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3376
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

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-72x72.png b/srcpkgs/oracle-jdk/files/oracle-jdk-72x72.png
deleted file mode 100644
index 0efbf9b689d6905cbfbe22679c995c30d99dca09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3904
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
z%0DLbl$G#2uo4q{o@Qz3a!nQI^oq8{RY{c&hOuY=jA#3Og*2f=b{COjs~9~kYvH*V
z`|UF>$L^1*qD9*_?oG1j<{Ju|A*iAc>~(KGp;?!~ZK{b@@kQqATL+&wK~|0UWIbUc
zxRvS{+e(5@N}H=jL{9e`cTE3KXH~NLU{faRo<b%Fj?`?OF)}!ZsrLt!#)qqZ!~Y(6
zy_6ANHkMvUsI><Y4*&!#E+GPbBm#jLfx%FT$56-<Aut3A20!8+68b*|F0M8XwtoM=
zfhx)~18;EmzZDE!ZM}RfJ&=HpkB_LsD<@BDOE;vbtA}0Az6>jV5TLHC1FurFc=JC(
CBx550

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-96x96.png b/srcpkgs/oracle-jdk/files/oracle-jdk-96x96.png
deleted file mode 100644
index 2d46ccf09947c9a159eebc9543db5bd765570956..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5532
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

diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk-vars.sh.in b/srcpkgs/oracle-jdk/files/oracle-jdk-vars.sh.in
deleted file mode 100644
index 500c88d6e74..00000000000
--- a/srcpkgs/oracle-jdk/files/oracle-jdk-vars.sh.in
+++ /dev/null
@@ -1 +0,0 @@
-export ORACLE_JDK_URL="%ORACLE_JDK_URL%" ORACLE_JDK_CHECKSUM="%ORACLE_JDK_CHECKSUM%" ORACLE_JDK_LONG_VERSION="%LONG_VERSION%"
diff --git a/srcpkgs/oracle-jdk/files/oracle-jdk.sh b/srcpkgs/oracle-jdk/files/oracle-jdk.sh
deleted file mode 100644
index a62aac035ac..00000000000
--- a/srcpkgs/oracle-jdk/files/oracle-jdk.sh
+++ /dev/null
@@ -1 +0,0 @@
-export JAVA_HOME=${JAVA_HOME=/usr/lib/jvm/oracle-jdk}
diff --git a/srcpkgs/oracle-jdk/template b/srcpkgs/oracle-jdk/template
deleted file mode 100644
index 13c0489058b..00000000000
--- a/srcpkgs/oracle-jdk/template
+++ /dev/null
@@ -1,138 +0,0 @@
-# Template file for 'oracle-jdk'
-pkgname=oracle-jdk
-version=8u202
-revision=1
-
-_build=08
-_longVersion=1.${version%u*}.0_${version#*u}
-_tag=1961070e4c9b4e26a04e7f5a083f551e
-
-short_desc="Java Development Kit (JDK)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
-license="oracle"
-lib32disabled=yes
-repository="nonfree"
-archs="i686 x86_64 armv6l armv7l aarch64"
-depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget"
-hostmakedepends="wget"
-provides="java-environment-${version}_1"
-replaces="java-environment>=0"
-
-case "${XBPS_TARGET_MACHINE}" in
-x86_64)
-	_arch=amd64
-	_filename=jdk-${version}-linux-x64.tar.gz
-	checksum=9a5c32411a6a06e22b69c495b7975034409fa1652d03aeb8eb5b6f59fd4594e0
-	;;
-i686)
-	_arch=i386
-	_filename=jdk-${version}-linux-i586.tar.gz
-	checksum=f2dd10a94c6b05e8b475a3a45233150440c10f3020d44ad3c00d37de441ad7a6
-	;;
-arm*)
-	_arch=arm
-	_filename=jdk-${version}-linux-arm32-vfp-hflt.tar.gz
-	checksum=0195ca06218c4d38964faf796c793855d5041f9bfb71ddcfadb056dc0e955419
-	;;
-aarch64)
-	_arch=aarch64
-	_filename=jdk-${version}-linux-arm64-vfp-hflt.tar.gz
-	checksum=31eed2bf84f5aa58d325be4bc388ab9f82a6f8d35b446530fe89097576b3698b
-	;;
-esac
-
-alternatives="
- java:/usr/bin/java:/usr/lib/jvm/jdk${_longVersion}/bin/java
- java:/usr/bin/javaws:/usr/lib/jvm/jdk${_longVersion}/bin/javaws
- java:/usr/bin/jcontrol:/usr/lib/jvm/jdk${_longVersion}/bin/jcontrol
- java:/usr/bin/jjs:/usr/lib/jvm/jdk${_longVersion}/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/jdk${_longVersion}/bin/keytool
- java:/usr/bin/orbd:/usr/lib/jvm/jdk${_longVersion}/bin/orbd
- java:/usr/bin/pack200:/usr/lib/jvm/jdk${_longVersion}/bin/pack200
- java:/usr/bin/policytool:/usr/lib/jvm/jdk${_longVersion}/bin/policytool
- java:/usr/bin/rmid:/usr/lib/jvm/jdk${_longVersion}/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/jdk${_longVersion}/bin/rmiregistry
- java:/usr/bin/servertool:/usr/lib/jvm/jdk${_longVersion}/bin/servertool
- java:/usr/bin/tnameserv:/usr/lib/jvm/jdk${_longVersion}/bin/tnameserv
- java:/usr/bin/unpack200:/usr/lib/jvm/jdk${_longVersion}/bin/unpack200
-
- jdk:/usr/bin/ControlPanel:/usr/lib/jvm/jdk${_longVersion}/bin/ControlPanel
- jdk:/usr/bin/appletviewer:/usr/lib/jvm/jdk${_longVersion}/bin/appletviewer
- jdk:/usr/bin/extcheck:/usr/lib/jvm/jdk${_longVersion}/bin/extcheck
- jdk:/usr/bin/idlj:/usr/lib/jvm/jdk${_longVersion}/bin/idlj
- jdk:/usr/bin/jar:/usr/lib/jvm/jdk${_longVersion}/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/jdk${_longVersion}/bin/jarsigner
- jdk:/usr/bin/java-rmi.cgi:/usr/lib/jvm/jdk${_longVersion}/bin/java-rmi.cgi
- jdk:/usr/bin/javac:/usr/lib/jvm/jdk${_longVersion}/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/jdk${_longVersion}/bin/javadoc
- jdk:/usr/bin/javafxpackager:/usr/lib/jvm/jdk${_longVersion}/bin/javafxpackager
- jdk:/usr/bin/javah:/usr/lib/jvm/jdk${_longVersion}/bin/javah
- jdk:/usr/bin/javap:/usr/lib/jvm/jdk${_longVersion}/bin/javap
- jdk:/usr/bin/javapackager:/usr/lib/jvm/jdk${_longVersion}/bin/javapackager
- jdk:/usr/bin/jcmd:/usr/lib/jvm/jdk${_longVersion}/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/jdk${_longVersion}/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/jdk${_longVersion}/bin/jdb
- jdk:/usr/bin/jdeps:/usr/lib/jvm/jdk${_longVersion}/bin/jdeps
- jdk:/usr/bin/jhat:/usr/lib/jvm/jdk${_longVersion}/bin/jhat
- jdk:/usr/bin/jinfo:/usr/lib/jvm/jdk${_longVersion}/bin/jinfo
- jdk:/usr/bin/jmap:/usr/lib/jvm/jdk${_longVersion}/bin/jmap
- jdk:/usr/bin/jmc:/usr/lib/jvm/jdk${_longVersion}/bin/jmc
- jdk:/usr/bin/jmc.ini:/usr/lib/jvm/jdk${_longVersion}/bin/jmc.ini
- jdk:/usr/bin/jps:/usr/lib/jvm/jdk${_longVersion}/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/jdk${_longVersion}/bin/jrunscript
- jdk:/usr/bin/jsadebugd:/usr/lib/jvm/jdk${_longVersion}/bin/jsadebugd
- jdk:/usr/bin/jstack:/usr/lib/jvm/jdk${_longVersion}/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/jdk${_longVersion}/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/jdk${_longVersion}/bin/jstatd
- jdk:/usr/bin/jvisualvm:/usr/lib/jvm/jdk${_longVersion}/bin/jvisualvm
- jdk:/usr/bin/native2ascii:/usr/lib/jvm/jdk${_longVersion}/bin/native2ascii
- jdk:/usr/bin/rmic:/usr/lib/jvm/jdk${_longVersion}/bin/rmic
- jdk:/usr/bin/schemagen:/usr/lib/jvm/jdk${_longVersion}/bin/schemagen
- jdk:/usr/bin/serialver:/usr/lib/jvm/jdk${_longVersion}/bin/serialver
- jdk:/usr/bin/wsgen:/usr/lib/jvm/jdk${_longVersion}/bin/wsgen
- jdk:/usr/bin/wsimport:/usr/lib/jvm/jdk${_longVersion}/bin/wsimport
- jdk:/usr/bin/xjc:/usr/lib/jvm/jdk${_longVersion}/bin/xjc
-
- java-plugin:/usr/lib/mozilla/plugins/libnpjp2.so:/usr/lib/jvm/jdk${_longVersion}/jre/lib/$_arch/libnpjp2.so
-"
-distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b${_build}/$_tag/${_filename}"
-wrksrc="jdk$_longVersion"
-
-do_fetch() {
-	mkdir -p $wrksrc
-	cd $wrksrc
-	wget \
-		--no-check-certificate \
-		--header "Cookie: oraclelicense=accept-securebackup-cookie" \
-		--progress=bar:force \
-		-c -O $_filename \
-		$distfiles
-	echo "$checksum  $_filename" | sha256sum -c || { sha256sum "$_filename"; return 1; }
-}
-
-do_extract() {
-	tar xf $_filename -C ..
-}
-
-do_build() {
-	sed \
-		-e "s|%LONG_VERSION%|${_longVersion}|" \
-		-e "s|%ORACLE_JDK_URL%|${distfiles}|" \
-		-e "s|%ORACLE_JDK_CHECKSUM%|${checksum}|" \
-			${FILESDIR}/oracle-jdk-vars.sh.in > oracle-jdk-vars.sh
-}
-
-do_install() {
-	vinstall oracle-jdk-vars.sh 644 "usr/lib/jvm/"
-
-	vlicense LICENSE
-	vinstall $FILESDIR/java-policy-settings.desktop 644 usr/share/applications
-	ln -s jdk${_longVersion} ${DESTDIR}/usr/lib/jvm/oracle-jdk
-
-	for i in 16 20 22 24 32 40 48 64 72 96 128 256 512; do
-		vinstall $FILESDIR/oracle-jdk-${i}x${i}.png 644 usr/share/icons/hicolor/${i}x${i}/apps oracle-java.png
-	done
-
-	vinstall $FILESDIR/oracle-jdk.sh 644 "etc/profile.d" 11_oracle-jdk.sh
-}
diff --git a/srcpkgs/oracle-jdk/update b/srcpkgs/oracle-jdk/update
deleted file mode 100644
index 19dbf98022b..00000000000
--- a/srcpkgs/oracle-jdk/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern=">Java SE \K[^< ]+(?=[ <])"

From ea492ce0c92759bd426f23ae6bfe5864b1980da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 3 Aug 2020 16:28:09 +0200
Subject: [PATCH 248/298] oracle-jre: remove

Closes: #23881
---
 srcpkgs/oracle-jre/INSTALL                    |  38 --------
 srcpkgs/oracle-jre/INSTALL.msg                |  11 ---
 srcpkgs/oracle-jre/REMOVE                     |   7 --
 .../files/java-policy-settings.desktop        |   9 --
 .../files/java-policy-settings.desktop.in     |  10 --
 .../oracle-jre/files/oracle-jre-128x128.png   | Bin 7847 -> 0 bytes
 srcpkgs/oracle-jre/files/oracle-jre-16x16.png | Bin 748 -> 0 bytes
 srcpkgs/oracle-jre/files/oracle-jre-20x20.png | Bin 881 -> 0 bytes
 srcpkgs/oracle-jre/files/oracle-jre-22x22.png | Bin 973 -> 0 bytes
 srcpkgs/oracle-jre/files/oracle-jre-24x24.png | Bin 1014 -> 0 bytes
 .../oracle-jre/files/oracle-jre-256x256.png   | Bin 16734 -> 0 bytes
 srcpkgs/oracle-jre/files/oracle-jre-32x32.png | Bin 1373 -> 0 bytes
 srcpkgs/oracle-jre/files/oracle-jre-40x40.png | Bin 1908 -> 0 bytes
 srcpkgs/oracle-jre/files/oracle-jre-48x48.png | Bin 2368 -> 0 bytes
 .../oracle-jre/files/oracle-jre-512x512.png   | Bin 38917 -> 0 bytes
 srcpkgs/oracle-jre/files/oracle-jre-64x64.png | Bin 3376 -> 0 bytes
 srcpkgs/oracle-jre/files/oracle-jre-72x72.png | Bin 3904 -> 0 bytes
 srcpkgs/oracle-jre/files/oracle-jre-96x96.png | Bin 5532 -> 0 bytes
 .../oracle-jre/files/oracle-jre-vars.sh.in    |   1 -
 srcpkgs/oracle-jre/files/oracle-jre.sh        |   1 -
 srcpkgs/oracle-jre/template                   |  92 ------------------
 srcpkgs/oracle-jre/update                     |   1 -
 22 files changed, 170 deletions(-)
 delete mode 100644 srcpkgs/oracle-jre/INSTALL
 delete mode 100644 srcpkgs/oracle-jre/INSTALL.msg
 delete mode 100644 srcpkgs/oracle-jre/REMOVE
 delete mode 100644 srcpkgs/oracle-jre/files/java-policy-settings.desktop
 delete mode 100644 srcpkgs/oracle-jre/files/java-policy-settings.desktop.in
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-128x128.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-16x16.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-20x20.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-22x22.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-24x24.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-256x256.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-32x32.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-40x40.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-48x48.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-512x512.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-64x64.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-72x72.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-96x96.png
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre-vars.sh.in
 delete mode 100644 srcpkgs/oracle-jre/files/oracle-jre.sh
 delete mode 100644 srcpkgs/oracle-jre/template
 delete mode 100644 srcpkgs/oracle-jre/update

diff --git a/srcpkgs/oracle-jre/INSTALL b/srcpkgs/oracle-jre/INSTALL
deleted file mode 100644
index a1f585f3182..00000000000
--- a/srcpkgs/oracle-jre/INSTALL
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# This script will install the actual plugin, advise the user to read the
-# license for Oracle JRE and to re-login to have environment variables set
-# properly.
-#
-
-BUILD_DIR="./var/tmp/${PKGNAME}-${VERSION}.build"
-
-do_install() {
-	mkdir -p "$BUILD_DIR"
-	wget \
-		--no-check-certificate \
-		--header "Cookie: oraclelicense=accept-securebackup-cookie" \
-		--progress=bar:force \
-		-c -O $BUILD_DIR/jre.tar.gz \
-		$ORACLE_JRE_URL
-	echo "$ORACLE_JRE_CHECKSUM  $BUILD_DIR/jre.tar.gz" | sha256sum -c || return 1
-	tar xf ${BUILD_DIR}/jre.tar.gz || return 1
-
-	if [ -d usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION ]; then
-		rm -rf usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION
-	fi
-	mv jre$ORACLE_JRE_LONG_VERSION usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION || return 1
-
-	# To set the java alternative to 'oracle-jre'
-	xbps-alternatives -s oracle-jre
-}
-
-case "${ACTION}" in
-post)
-	. usr/lib/jvm/oracle-jre-vars.sh
-	do_install
-	RESULT=$?
-	rm -r $BUILD_DIR
-	[ $RESULT -ne 0 ] && exit $RESULT
-    	;;
-esac
-
diff --git a/srcpkgs/oracle-jre/INSTALL.msg b/srcpkgs/oracle-jre/INSTALL.msg
deleted file mode 100644
index 0db583e18a0..00000000000
--- a/srcpkgs/oracle-jre/INSTALL.msg
+++ /dev/null
@@ -1,11 +0,0 @@
-- The Oracle JRE package is licensed software.
-
-	You MUST read and agree to the license stored in
-	/usr/share/licenses/oracle-jre/LICENSE
-	before using it.
-
-- Please re-login to update PATH and JAVA_HOME or re-source
-  /etc/profile:
-
-	$ source /etc/profile
-
diff --git a/srcpkgs/oracle-jre/REMOVE b/srcpkgs/oracle-jre/REMOVE
deleted file mode 100644
index cd3c8b2c398..00000000000
--- a/srcpkgs/oracle-jre/REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-case "$ACTION" in
-pre)
-	. usr/lib/jvm/oracle-jre-vars.sh
-	rm -r usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION
-	rm -r usr/lib/jvm/$PKGNAME
-	;;
-esac
diff --git a/srcpkgs/oracle-jre/files/java-policy-settings.desktop b/srcpkgs/oracle-jre/files/java-policy-settings.desktop
deleted file mode 100644
index 51a9789ff73..00000000000
--- a/srcpkgs/oracle-jre/files/java-policy-settings.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/oracle-jre/bin/policytool
-Icon=oracle-java.png
-Name=Java Policy Settings
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/srcpkgs/oracle-jre/files/java-policy-settings.desktop.in b/srcpkgs/oracle-jre/files/java-policy-settings.desktop.in
deleted file mode 100644
index ede6c92a8cd..00000000000
--- a/srcpkgs/oracle-jre/files/java-policy-settings.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Exec=
-Icon=oracle-java.png
-Name[cs]=Nastavení politiky Java aplikací
-Name=Java Policy Settings
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/srcpkgs/oracle-jre/files/oracle-jre-128x128.png b/srcpkgs/oracle-jre/files/oracle-jre-128x128.png
deleted file mode 100644
index ce5ed56646e88d6c87e1a0c62287eb6ee9ab7098..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7847
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
B4cY(z

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-16x16.png b/srcpkgs/oracle-jre/files/oracle-jre-16x16.png
deleted file mode 100644
index fd3d59bdac0a577d36439a3b3b6420e726980339..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 748
zcmZ`$TS${(82;1@b(!6WDFk6DN+`d>PD4c3mP#rfRwP}txlIvM=bSDhYIq0&$qrrw
zO4*%Mh%-|&G1)Zpn7TQghs`<N)VVdCbKC!a|F?cGyXb}IeRyBqhxhb6Cp#@TC?W^|
z5S)?D%A@$qF#`N39}^dnPtl3u)T~qh<jpk5^QYqT{Pesm03JmHAZq{sr&6+Q0ID$n
zcDVpB-U1LNY8%K+0>CFaCzHeWQbxGZ9|O6&L>i|^(>yWRPHxS5aVNQ}#Yf%{lkZ83
z*6T&&<_uJKc?O;$+d3o>^tg~^3C@2a^&=2@4_zLFyf^`sbE|W!o5mgM#)e_byzO-3
zqpCIQ{-Jr#J~X2pQ|rbSbeeVZfz$PS#dze#6>}@SW9q(N>P3T@fFy~~wAQeoHw{fM
z{g}}%8+Z2XhX|ofi+x<9|EXFVRjp2F^g7etajiv*JPsTp7Y>iygv$eQNJ5<wYI;b$
z5?Pi><0M@E?j;GR`GOBO;mVi9RJ-Tf6Le%F#@ld3Gh80T2OHp0A3pLLx$MY&K+JZa
z1G5);kYgJ;t<>Js4XyW+%P8_Gyp_h{b$4Yxqk=$DdO;QSn#E)IFk@ODQpvUqRx0PL
ziqDn#-i$uU8J?<}C>HX~DW)oMrNbUcv+vUaA{~tlY}V*V)J5Lo*pl#q>$U#usQw^f
z=<UnZ!C7(rvX<T#o$p$bn@YJI<$?!=9|c7q6zjvfd%ExR$iLRd%B3QSxTdo4o?_T)
zvKe-wOjf@zyVK#Ki9$}*9n{v7Or}zCp+EA2Z|+<|LendG<$hqwX>bD%js83t97xR>
zC1Kx{2zU}9gD)0R1n5{oVjOlQj!x%b7$fl-gMRfAMrUAH(Ydage*|R}f|8=z{|mxW
w0wyRy_;H8)iXw@WCl&&!R2pAWURuTHiG=YL;^J0YQUp~5GT7OyPA0eRFNpb-JOBUy

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-20x20.png b/srcpkgs/oracle-jre/files/oracle-jre-20x20.png
deleted file mode 100644
index afdcbe6ee6bae6d0a0eee16a862d35457f932121..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 881
zcmZ`$ZA?>V6n=4=VW^8yGgcE5WRvKOc-IhT8Z)65X_Yor*akAU)(VbH2ZOq9i$4%q
zVn-IlY$}2%@Wa&131jF`iqKl1Ur;{!MfvE5K+(1cTIs#-d+*)L&;8hsbDlgW=Q$_m
zJZh;VYhA+T1OUJ~kx+0H<EE8}e*@=-pNIEjc=J?-I0JyTnl(uN7UoF`;ZZRFKcxUr
zQ3U{nOBF!?&JqATlL5fH20&tI!^0!{0EkmbvvV_9mSrM77Lmw#pQWNK4Uw}0xjR{g
zX5lilw!new$fKo09yoNH>c0w&4QN^q2kOwYfowfP2Q18j4^8QzrJ3rgT6h`t1;ejn
z6djGA&}3{vM<F`06djwIAt5rmylwhntJ^m`F*D-vJEmvn7nUHRTlKcN(4yAr>K~gj
zj85uDCT5<$=rlQchsJwt;}(}M8Y7oUie{Mk$kNki3!%kVokqK++oI80Vt6i1FO!gA
z7_G(Cs<Rm#(}UywAx~h??RWcw49iAily@#{^90OJugU2h8uz>W!SGU)VOV<B#zef(
zbOYJj(PR(ubklRA%;GFP@1TQrI$*}{fu=^}XeZm1l;JmMzDen7;K*I_@3TzoB{bin
zda9|uD`bZXx&I;Wou(eE$@X$)`2{pLLSsFe>_wg~CK_fD#nOnyD`5<qa_wRm+XLcG
z9L^G)8@`|P6((<&3iHdc*UpuQ<8QD30T*o|K}PO-qY7C%IGD0}ZO;=+<<>q^-{6z;
zDSbwRRbQPt(7!wBVpD-IPq68LH2Vww2C?wav4fvUzRWlx;)tY~pNfwk$T?h)m6)&j
zrLp^bQ*-V0J%8P*ZBuLNI)C1F`O@zlzuvu}RbOb?$hWu+cI$DmRi9&BBYO0p=HAW6
z1?e(rX*{1uTf1G((N(O{y`S9DtT+*H`8TewREuhjJ2b_M^PIZ)-akSO6J2Q4Cr!HK
zDw*WFcT{<z;(W=w$qm(qOglg1?A>tZ&epgDFqZv+{q)y$VSL**WoDl8q+D6ZQ<N2A
z09@juv|YrWU0iN1LGaS{^0*)GB)B|+DB9Bc{eJ{!N=_CR{rLZa#PoO*7I0QJ<dhUC
nRr0bzpi-$)i@*J*Tp=$lOf4xpRUg^688-n@rbO^3Usm}qmIUq?

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-22x22.png b/srcpkgs/oracle-jre/files/oracle-jre-22x22.png
deleted file mode 100644
index d8729408f8231ac2896ae2a71c40880cfd95600a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 973
zcmZ`%ZA?>V6n<edQNbnt*aS?B!)Q<@DM*Oxh#91f1(8@~%hY9|K*7=p4OS6dl&p0h
z;sWWmtXrKJ35rx4@+B=FW6X}WK$WjT`7X9lE&_#edwcKu-g|fXxgSf;bDo?h=gG;*
zIp3d3KfYso#C8C{juesLG{^64V(VL6_T}H*#?jk(Nhgy4cvc>QBwM(8Z?@?4NdT@L
z0H9P20L4kA9sn-$0KhT<;A;WcrMPPpCjt;ue=03Q$g(W6=4MDAnrLU%=4sC`wBBQ3
zfRoXziR$=<p0m=P5thQyWG893f$WX2?*ZdmWNAn?U8bF8+SL#Ht7x~4Y`Q|d&@h}6
zU!iAv$OZ)q35H=Qh#*1(ldh4O`3-_337lA6Sf72ljuZX>)$ec;BxSVPt@fGTG3U_q
zybD_$on2@&4U!NUtoA=`4%5)oi^0kEzEP)V**r3ht@_627CUW@p5bYmV{UDO2vCq_
zn3Z*W%Dq%=v{ttKbFbO-q|3Ivj=Pt<+GpK=y&9izVUsS*KD#jK#>QVSdVPL~=q2yQ
z#A~drchq1R>F6K(dthP>Cs>AN{mVE(dN=&u4Z`OSkQ8G4D^$ChCA=(6u{2@>K86eY
z4K)8ob(h0eHE70!#-780TB=<|FASmK`oNPsXsf0=zoVTNG}Q$M>qx^**ms|-FQ8qv
zfIf$8E=Kkys^b<M)HBP|WJ?JeYlRjaeEE>Um*LP;W_6D0`2~%)q0wfRVYq9a3Ap1q
z3d%ZhTu_b&t4OZcrVyRI#68LACW4ZqbXPgimm)~Y2ph`I{5bedTId)!5|SYPG~voS
zY2x&lf<0e^ijUn0N_sz3EZHgE8T-M3vJ;|I$?eo$^KGjoIx2Nv$f1M!n%c+m3;8nr
z-jF2^hAql>haCzFuhL4g@^cF$vTE5yRenp|?}iRl)sK-4+QzbndR^PMk9MgvM>O@%
z%m1jnSt`CSuMqPz3eg3vuvMlm$oZ)#UZY6+GEMZk@~h-5O>l$5a?tYljVyLi7XGWb
z`)uR`$A^XzlH77D(cG;On)X*qrS5kle~zlv*UIyku-&Z@x(c=K{JDwokND9>qp7Sy
zef?TE)ph4s4FH0=*ge-hkAC3R->(#Yrp%EjrTpw7DMuiV7aM<=mvA^PE`!J8#~<a#
z9gXJ2@p-(8Pr54qW4KtDBg-xMe}i-D)qR{Hd~?E?!dzvsq(};ii;H7q1@cST5`{FT
WuqaQrk{H1?ffQl7;AwK^*Z%@NelW5C

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-24x24.png b/srcpkgs/oracle-jre/files/oracle-jre-24x24.png
deleted file mode 100644
index 70a59d78b7371a61a9a7231c58a7c9f2b0875068..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1014
zcmZ`%YfMvT82*S>6vlpRV+iW9NkJWfbVZGH&J5QM7?*TX42*4|LQy2#uhp11!z4Q5
z#6^d~=H`&d#cpNb7;MUDp<1L|3Y5}vD^{Si1qyA?`OZ1t+2QAY?8oywdEUHF-sFAX
zE5d{*AFlu}0Dw<SH2(ynJ2$a?3&Xm`0W~9APe;Z_0wDj^n-sGc|8{!xiFg3c1p{!g
z0szRAE-nI4!U4dN1^}-H0KfdY&QFg5;L$6L6A5UVMjOk>X`|-*sRb=^t-#)!$guz)
zSCaZa(fSf{*^zY$Z!aZATF7Yy4c#>1##;->F*%{SO$<Fi?p0i#hgRmWMlm_wMw!%v
z`Uk8&8DVP(AxKaNx{-Mht(aiPdE~Srnszwd8*coib@kVtA?=iTW!>f2aM`VvrMZa(
z+nUpjKm13tWOw}aT-QA~`D}bft(zUtn?`3AOiOl1kQgNHbv#{OU2o~uJkjVC!-hwy
z(ILY;4vAso3+=QSA)2Hp<%m%=Hf>wmaAA;v8;7^$J+-Zh8is#YPMMb}3U&4C8oJbW
zhjZRy*P9k6=a*hsR%RD%6hd>0wzfWPTi-}~pSE44?RYlUGi(^2T_8x(Xtq%1L2|l>
z7;1!y>(sJ=)IFjsddg}<wi#l$2`Z{7^AMrA5BqKr&+idh8S(TE-c~{r80@)5PW(Zr
zYOuyM((pIlRt&o?k;W(F=x<Q@9oC$I@O8Z70xmmCj>@rS39`>(O{XZc277o0DsK=2
zzmWP)8oG$#X43GOCO1#)<SINF@i-M5#lKaZ6%xUi9r@8IMa<{uHsNu6e{DI_;2Fb@
z6zv~OPy29NRop8R9^u}l1t$-ewwSED>pnLoE2ZT)hOs!ktgkBse7Qe6IP9GRRbyTU
zviwsb;>1#xAV}hybg0BfR1hDUv*(KsE^PTIK5)+)JJMfI3@`GI4awe>x<wRP>U#BB
zLxLtumTQ0T+FP<8zkDg19zS;GBmt$+bL%!%ct_<=(G{0jl~MeU1qOfBPUYTMr8Gjh
zj~yHlR9j!)@N+<Bj-TId-<!F<_OJHVRbL6b+}c`HxbE;zDoQT&7P7s*xf)yXNxwRz
zUh;0UklmDhcG<Ekp!QDcX9gjA@_k-cXX^QLgqjet;lBK<33bZ5DM`nqY7x6&{LLy6
z0QbL-I8+ndn8@rYs92C(oFOij@X`w<i~ug@y@R2g!=YTRh{NF>Ji_B13E^;g9M1Km
z?z{g9<m6>!WlH})Ft@!tkO}y2PDsqlEG`olN<djzSy)zXc2T-GUlNvAc)HepG=OOW
NF@glX?0DLxe*wx;IK=<}

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-256x256.png b/srcpkgs/oracle-jre/files/oracle-jre-256x256.png
deleted file mode 100644
index 59b568fb25cf05d52204f0e9e442fd5f6cd21c45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16734
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

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-32x32.png b/srcpkgs/oracle-jre/files/oracle-jre-32x32.png
deleted file mode 100644
index 29441b4604707d38e17b2f7a55890babc21fc211..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1373
zcmZ`%X;4!K5Pm2`6tOcp9Xv*+*1<YbZA3&wr!5*zfe}$Wpe-Z<ML|vhtwm9k3V4)J
zfpW{O7(oRM#F(HEAQ1?JKmr6g5+DglNJ8@N^zpMlx-+}q?D5U+&hFjg0baIiHm?By
zz}Cl`a)Q8bmeqPCVJTJFodj4$x%;~VK+^*oG~8-AN%KD84**wp0Kkn*0Dy_mjX40g
zOa=f&7y!5x0DxV5ackgV09bMTxZg<+Ga)#RYiG<Df)2gHmsB{YgV{N_QH}7*;m&+B
z3L)La(90Oypfn>U+@ytDGr)!@Of`y1IjHa@z9_>@i%?TM)D(xSzaZQ~99%?tN=+rc
zxPBh#Dun14%?JoHZ$a;_f%W0oBo}H)Govuve&3k;JvP~8#xbP79-a7v>*h?wKG5qV
z+-!ys6vZ%vTVR4<g+>p-2r;Hqu59IrgcEXu2{Pj-Dic5k4G1Axz47C~SXFDc5riNF
zt!eAYtY~TaC}`~wwef}--9wC?AtryMM>JssVGP4nT7zJ0TBg*<RoZ#AZeh`&TQV7p
zAcA6jlBxVg&h)%Gx3;a4(fxwc+xW4+;X`lvTkaz|n=6!#&M27tVb!8xMycTqe`yzt
ze&`i{8W<Cd&CDn?>^^bHn+{g5m^&mLmnoY*3Gy0PSyk`uRx=73+ckRQ+b&^hKAqhs
zSu~iIKuB){m0JDOyn1k4#`-)`|DIpV<kh|B*R%M~Sf3l%y)9f}$G}*};8?GCYGi7z
zTQt!*INshr%ITAE`Xy4i3WO2jgcy!5nTXX<d_jsYEnsqismK$X8^SeHW(+mMMock`
zsm5T=edz5~ure4GGvKzH$mdF^IR)XBfi)pWR}rqAhTdETpV7dlLD)<$uA2pGf5B#j
zFf$Wsy@4qurcytozYf<c;Eu--BORh&0Bb@`g-4OTT5OtUD)q;{bV9F_p~g#a=M#iq
zVJh;*W(UC+(NJ?L%*ujZC79tQGh~3<AK<ES;yK+cHCY5$P>*?0gsa<ZZWGSxc<-}G
z#Lo{etHqI>MQKFA8y|}MNmm{%?B`Xve*Cqdg^gqS6_=ECOkHkqXqt?1B@F@(ZcOO0
zv0k$}=dbL^M|SxSA5rt4aAGqWikUZ`uD7?_`J7zmOP&fWuc24eSKsr>xKA%-Wo!$G
z-cH+)9-AH=L?Z1=vhj;P=6G>S2<edRAFD#VzKgOuz1HfI+P?Hxspv;mIv%jr!algb
z(~@MBm3im37sYcgnZg~RCLE0ky>^6pBGLDm&$+847q4@XkrA^qa@i`1hb7hI=^h@K
zK#!uj26xw?dDi-YSGsK9m%B(L8^5^VVPT}Guuv=!9dLH3-hY64CT}8dL?IPP1>(me
z;{$`ESq@bji(zDkAHT$zk<yb{KS(~mX@AW=KH24Y+1WT3-uj~LQP26|Y#Vv+23pC7
zux%6H-Z>bvA}9a%uw4&Bn8{+@*N&(Cf7{*a8L{BzXGNmMC=WD*HV0lGlzW7{Yq=2i
zPh%`%lpRV@OWt4Zlm3Z(6;Ina(j0lPtUUXUf>V9SHpTv2PQ@4P-<2T`w*JJ4*9oID
z_GL$%>VMJinp#?TYrfrz<gjilsm03fhXAi2cEY?<ie@F?Ai1{1E8<=Taa4z7k2A^V
z!;>T2Xo(R708Zq+&b!GjyPcd)lF4q)u5M1Qj$|h{GWp>tcG-Ujv2o|4Bd`2FVbVHn
yJ3-jA+#x6~GC4IoF#<?UP2CfH>0%NsJU(JiTw+v_`tW9=2=MU;pwN$m-TW8HBPL$}

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-40x40.png b/srcpkgs/oracle-jre/files/oracle-jre-40x40.png
deleted file mode 100644
index 789bb3cc8cd3b131eac611f157890ca7a265b251..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1908
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

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-48x48.png b/srcpkgs/oracle-jre/files/oracle-jre-48x48.png
deleted file mode 100644
index c3b3cce4ab64fff9c2637b18f36f3c366b884ca1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2368
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

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-512x512.png b/srcpkgs/oracle-jre/files/oracle-jre-512x512.png
deleted file mode 100644
index f9129d1a7ffbb374cf4247e3e86e7b56521e96f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38917
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
CK?Py}

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-64x64.png b/srcpkgs/oracle-jre/files/oracle-jre-64x64.png
deleted file mode 100644
index 79618c3c9c5beb20d5b22acc75443a0cba401ce7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3376
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

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-72x72.png b/srcpkgs/oracle-jre/files/oracle-jre-72x72.png
deleted file mode 100644
index 0efbf9b689d6905cbfbe22679c995c30d99dca09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3904
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
z%0DLbl$G#2uo4q{o@Qz3a!nQI^oq8{RY{c&hOuY=jA#3Og*2f=b{COjs~9~kYvH*V
z`|UF>$L^1*qD9*_?oG1j<{Ju|A*iAc>~(KGp;?!~ZK{b@@kQqATL+&wK~|0UWIbUc
zxRvS{+e(5@N}H=jL{9e`cTE3KXH~NLU{faRo<b%Fj?`?OF)}!ZsrLt!#)qqZ!~Y(6
zy_6ANHkMvUsI><Y4*&!#E+GPbBm#jLfx%FT$56-<Aut3A20!8+68b*|F0M8XwtoM=
zfhx)~18;EmzZDE!ZM}RfJ&=HpkB_LsD<@BDOE;vbtA}0Az6>jV5TLHC1FurFc=JC(
CBx550

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-96x96.png b/srcpkgs/oracle-jre/files/oracle-jre-96x96.png
deleted file mode 100644
index 2d46ccf09947c9a159eebc9543db5bd765570956..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5532
zcmZ`-WmHsOv>%2L1f-?Adq8rip`=q<8YLwZkP>FVVdw!Qr9+e&LK=opT5^zXMWm#=
z-~88lU*3mz*E(mfeec<4$KCsPBF0c(gY+T8LjV9ks->xBjHUMfH9`Vx|2s24221c<
zl=YMWfZ9aj8wY$W&*r3QtOo!D^8f%aH~?^keFfVD0Q^A!z_vXA0L}yeXnk^8jpVT(
z2pn}Z)UXu$T&lJ~v4qG+)6y5KZRWp*qr#UR2mnwAX{jlj1kUf~2Km^ShxRLNh<H!^
z{OPWhjvjc6w(oCac6lO(#{<D7l^`N70Fme{IM5Y9i0ey+sll&ax_%5lO9V!K0C~b7
zSv~CR`YPxib~Cj1SMCKXA%(52-Tmc|(Jj_<%dd{=wah2Wbt(J9*}Nm|`^zh`D<NT>
zE0?#Ux6FkN)7A;&4E1>3<@H=Yzn9hno)B27o$cXmnOS{sdwoi2Phg}VXXrxqzbqSG
zV9=l1enH{E`sQFFK>dkfXb2=I?eRJ{c5DF+_(}9AZ^is0>ju2dca#c#cn<gw6YnP#
z=3mVTr<xw5$skIzADGol{6=$C=>yR~+nM%NSvp@S6RRw@*QS)K%r{DZl2Orp_?gF2
zrdBy_ucs&quI#!(kDjmosWn4W8A&%yaOlNV!~(EW9UstQR5d{JGxn&kfD-j!OKVBI
z(z+<0u-lo^<=kjj&a;txm7WDb;pw5GR!&n|qM)Pm=I8e;Q=Md$plQAQ9_yRWThLEw
zO3$B~n4Ae_1J-}--qY+k*{LVy0tKT(m!fKCpg!&^c7lGvSbfN733~}q{O(FuswxYh
zpIAcEv64>{l=Y#LJ$|iJ7+%P+OV=X<#W}$uti^H{jC{_ZjCRuE*ABgMtPty%OMt>#
zhVw&c-@?6)(lB|v!^%O%><pCY-#|}{{-e2e(&`=ClL4*anI&Yy*=@9iPDwThDTo9}
z1_CyIi53Ru;h-pLAO91EzHd0v2klO1QTn^n?w##(8puatIuKpyV@`gR)vYx>G$j!x
z`}#Ri9WaK)2QXJFwbc>3Z`LP>56bwtti21D`+;pxxQH{>WWsBN0b5Z*+GD7;wHPPl
z>{b8esmplG8e5lZdwSPG2NKiq_J&E}4R8YkRbvUmqbNVs=$jAeA~CVL$>^aG15VDV
zHj{-GPF?~rej|~&O2L#H()sFnfs_<g-C@TWwPs5;{sJ4lrNP*6y>HuPEd7SdMxrL8
zznWl|vv}D{GP-7`niu#`mvN^x(Gi8N*p_3hf_<#n4g&_Ah=E8TPE}~)<E+6Hp_coM
z0ada~Qg=&a!``jwFGpLF@;m@GXp2m)<h5p%Qvn9s);7bdyX~y#qLqS{Y;wt|HRled
z@@&9X(a-mHD^?EmwsDwd*9m^GKS8bxxXMe7&C0DzlxRv1=D-nAJE6p2q@@0~B1uK=
z@-PVr4)J*>VNF!(1%!uVI-FJ3qxpd@;e_8GMx2eAx637e2{5-hihJr$1;~u^QlAXC
z3a@`5s_8QEn!-c1N3O3p8!R2swDw@rv2~)zjv8w!2E^(yWn*tq8h%@fSsv`?B+ZO#
z)Qx}Ct;PZcwrnhG$AuYT!vv^o*zdNkq0jxN&hqXcV(o9kzS`v2xdsl*&nMvBie0Md
zdNT(hIfmz-aK6UmSa-<Xm(oJj6h=%vUC7UVZT1JG-yysPYrA(2rq!|U1+h3)9LgLn
z4aJY8M}N7eS-knQHoe_;JKo(gkWN0ZY_mB$ryZvl+9n{}RnleshVcvqjgmjC&nK2)
zeTz-#FJj<ny;6>9!&4Erss0EaWkM)VCHJ!LeWX~3WMAb=swj_z8ncyzpXc(LV+KDo
z%Ab&gJ~E#q1VHF4JeK1c&O!r2_Szvd^m=jM9$qT9&;+olG^C{mT3K6it}?;H8?KfH
z)(i?L`$1OK%u1i)+>#zm9|hP~p?6-2a;I_R3MTz{JkH==%>Ek#LKx*uQJSVDC2J=S
z|B;o;;`un}Ku@6OFX<;S<MjNQnskGjoUB?60eJz<=(K2Yzdl9tZbkHbquYLlpv*tT
z#cl{k?^Yof?^RT?ajoOGS6*#ivc%5PBZ1k1`Y>La&~B}>x97D@*CccAlFvSaZD;2C
zzR!(F^cCabo~fgjjc#oQ_P+e*Y_wG8zf0tfk&pa$WyTUo1zgU>>)E=0;J^=9vAf^M
znYv)3{`kgDM?9IT{^dQz#$8#JnZqYo2DOv%dZ(4UUV6sqV}@&9YLxydr+Zc?BM85K
znwp8M|2P^E@obq>EPZ`PY2nB6nu~>0XM$+xs_<k#hiJh0&{OqSu(jZugTmccp=WIP
z{m_t-I#kR^#beAoU8m4(MPy98KU-SQAk6>`^VguL7d&GJ7KlQO1m_mhVHSunW5mhm
zx{|;8Ctc#v)zpknsSAuMw3}(0dG%_Y*tt?vKm|q~p~<Hy&+t?ra)V$0jQ67d{#{aI
zpN!ripJXz5txu9+S04y|PXR3XcFa|k8kpB}$kkG$+OcWO*GkQl@#@>Xoj|1L$DU&L
z`RpA_sp>RRoehkkT<B<ltnK@k49$5jxYBYl9i@agjW3V#p3fZj`Ri=%F@6s4fq%nD
zIDM2av(DS=aEPsnGI@wnc1tj0Na!O6c7s5qxId{a5XxPR(Qu%es`7l+Z;4(HSLDq2
zgrUweG@{iaQxgOur<MMScxEYIR->D8H9O1`DDW4Ng;0L(l!J9a+O~}xC27phWNz%I
zfK|Xtqs{+mg0IBT%87v>-Oc_v54Ov?3+NKB)uZYLH4lX4QC=1eRpIi!E_valgB!Oo
z+<FsdgIDg%!UpdW*Ax25WuL9)p9C|#>$##DV=dg7bu0P?@a}Zu);r9iZ?`iYftQ%v
z{L&Ovnrn?Sk-GmO8W=NMdyjX2yI@0ySRHGubQ;R)eG)cSPLIP7=yR<YcC{&jP4z0f
z4%ocw#RrY>)L3f_ciL%t{#_5<FMF8YkQ~wcGwGR>Sl&FP?}@C-%6#_68%>_S(<OC8
zmS{RiOh|FG`H|<O$%C{5w9Fl6DN!F6CLm7o+Cof4JWN~+k0>8n5VDi2*c19#Yw_4|
zVascjhHmIDy|y!*-p0V6IBI6HA@Sz*O~<`ibXJQnY092ls_ya7m)6<P(kQI@mfOBG
zzu|Jx1rJ7=e4_ls@MLN-`K8{vs9-vMXTDYztDR%8H5-XoneV$b6vis?3y=gS-Hnn6
zzcf+Z)w|s3Fz4~KXm0;a<5RpOQLrDgT(@sjNc0T6#i3W_Z-bOQ!}`<@Q*{8$IIC_@
zV#x)uxySlhDVakoo&C8FAGM7&zbx-p?`G17Mm-r<syIBi(u4_X+Tw=7^f|rPS=;WV
z32;$E-Y-#4wKihwCHrDDRB3mM?rM$v@z8YIZcJmvn}KV-xMdQnZJ$2>YWt+TAkgyp
zuizWip@ed7hzDP*2+okebJu3dQU=a<ihW;$8u!42uFEY!q#4&dYqHlyBc)*ACzG3t
zU%9WA{9)+`I%7BRLRM*FWDMdx{5?)Yx}|s@a9pP9(`xXGV|B_hq1za-Q4;Q2z4yW%
z8RK))CJn`<+k_BE*U{-kmu76fVylOB{{zoBO%O!J)rpP(LGCJXS)|jkY3L(=r2b$g
zrSyYy=uxDTb>}-A?-noF<ArijC2N1YOvJYkuO&#R(08g3Bq&MqS2GK8M{LPaHQb=@
za;A*vfm>N3MIvHIysVYUq=!(jgnsC+?2{ZWv2=V1=8@ABlgQ~THG!dD%gT>VNyeYZ
zs5lDgG#Y-|3@-h!FADFH!21T%<Dx4NV<|z^rjIuAJZ_YJ(#EeZ;dgi%@xxR4hc-mu
zx&2Cv;#+2UErIMW4Pv7ajXdD2olH~KV#UWngMD&U8daM~gL2fdNCOpqFhh+H2Ya>;
z2qHnvW^Z@brKlhgn;IL0S~oI(X{3xTvJ@MQxz-&(XtxvEty_E#{Zbf}&_JtjOfvfz
zXQ8Od`R~MgWB$CknFQmjZT5oI=8}^&9BTt(Mp9qBej$c6%vXc!FA=;ngStp8c-;9k
z)0%5zC)pM3JWzM+Bhq|Hj7_zKHEk01fj<v#7H&J8!aS&SHX3St-ahe6c)jgJ!NGm%
z!0<b<DC+iA*7uZ$O{uNAF2wPleYyI+o^bck(b037`?$u=)P!xxPmAQ~$ZU4L&KH(x
zuF_Z{;aPWCBydH|LBHmEh9D<GoukzRbgEVjeQt74ZgkkRaHLSuV5%mfii7`$T@iP@
zOkauS&G?yRDKb?FQ%#zUe+N_L`}#)cc4$i3aXt6JV)q;T6?IYz9{*ZG-{%Y#SQzc~
zwQ}{S>=nNqZ%U2j{4(}+r%P+OIgFoq#NS*5XQQB=$J~c*=+7-LDDBrjS4829EQ}x0
zgg+-o^x_W9Taq6;nUz6lM0n4Cet$N2xTYFW;7LU^HwjmroPxW#m6l*j2n&%Y(gumi
zr-b;xwbz_w)PsIV)%N$VR%S*F#k=#D(Xl(`!;7)eUnxP%pN^*BYuZQZ_in;6BKZBs
zojOK_B{%3=<Boxiqi$z@UZ#ihaNIjJVW#>RI1mne>*gqJSt482Z_(HVag3+JC4$mx
zLxCvCit4RZRJNIQl3cSp(Ett86_pb}O(pCBfoC?%(>A@(%!;$5XfyavoCtPNHmT~;
z6d1x5PIwQUONtw%ljTFC4j1(cTMyid$BlLFMh{S=8BJ1KZwzVhG)w5Toi~~39DF2t
zv1_39H{~6oDaULAvn{R1pgXk?WA>6BK~(9126Csm(&wh-eQG)N@0w^l&)<>`R@)wK
z-c?TeI=G&s4Lu&;X%2ssN5GB?`Sn^KjyAI^xIp5nqSmyT#_rEPoiG}4sHTcL6vEW`
z>=U6yg@9VuXjd)nx#{(U%8!sKiUW65e|dsxNAy!jq*0?!z5Z$8mE8gJxuNjioCGS#
zW!qjpMx3z0T7&l==um>7y%t)EstUhrLF5tli+X~sOHqA6%dNNOq(9IP%O*xpifCuJ
zVEpzVkq&Jxv&xq%%q7JE6QLT#;iLGgmK1G+ZO1-Qa}s-eisU|G4<fh7(MQ*5{*ec}
zBY~zi2_nvzk2swi=Ir<vY36FGU+yF9K2Cg~;f2ut9Ka=GOH@EI$VZPpy5uIPC+Jpz
z?}*8H_p}~T(T(W9jB#c(I`AfX|2s_}_b<6}piBQiz1K=emR<E(2O#u_G`=MpdrD+K
zzXi^<Q7Hrib6JmfKaktwi~aTmnJ-1Q@8KFEj$CMXVT*)&jo!r?1}c1eN@W;lAK%SI
zLhw}7%&G6BE7`YzTY!-qV{t9jr}z4KDu16E;$Dl<zRJ^uI1?%alIQ9`cK;pDn5`eK
z{PMcyvA|I)tuoQDf;f=m8Wa(b6|h|M`W(+nL*4r{RC<a2I~Yjr<Nxf-ti$1)CNLx4
z{cG4R=hGBAl&_kzoFIQgIE^4<$J*yy{glTbJX`%#-j^L`OR+v17jEZKWm2<{Q-{;O
z<wVE41Io%swRQ*}C0$cEr|P^3e{;~f*WG$%bLU;{46KQm%~tYPPBz7%OCZJ!K5I4z
z?H3)eDW^|xa~kc$RMV7meRYvD6AQHsS2FDG*G@C8U%}wqn{xiQH$U^Im7n8SM&4eT
zO@7?Kx{LW(SBha7rspXDqYK;w7GwL=*VM1;Q<z27ordS4qa`l<e<P3uQHlCDnt~@?
zVfWVEXT<jjc82IrRusv>YMychp>3;wozYuqtT>_wzwyY_l|b&$;&+cWdOZ^m_;hvY
z>}~mK8z}>MyKC$5{)#aSiolCp_j**$m95ov<L69*YS`Q3)ph<2cnO$roI&y(UeE=_
zWSPz8AO6l~sSmsyI1WP;ffVsU(if*i4Jx@e3a@TJ7VIYjM4jI`*cfQ9+O~4Zq!a%I
z5d@tyt!)!juV%>cIsdRaYd*r`i<$9f-FvojsKDN>GC8aQ|J@-r%KL3l_wt$VG7s9G
z#76g;hDJl*ao8#re4Mjy%K?&`&L}Ut7~fJ}?C*>XSe-G{RpmoOj|!AMp?V=|m0tbB
ztd}UM9~yPNX+C~Q(Rpx23XPnr9SzVz0haIVe#u|7@IwWih1DfQ)bfK^a+#mzE+=5n
zbaQpxE2Hvs-J9r3bhd1>LD<i8KV3$T)3(~_<!9vsj0EeyZnjefiWAd41y6oZ7RaNk
zuE#I&@Z4*>FNOY2H0dk$BM*$hme@M^Ya0bVmgl4O-?p4w+_|ZdwwDme`gA`vo@|`v
zpMYtkyw<yiMdz7QX|}#3OEw=RrUcsP7E>+3AhQ&mXB*t#bD&OcGhE>eV7UAVIamQe
zI6TT2I%OQeBKxaC;$71-_>SQ8jV~W3PO!1o;GjVRMDF8Y6<2{TXKBjV#rB^PhVfwG
zr%O!tH$6mX1tr{d_V2IbJ-pft5fitku4G{8H_Pk^+xsfq$PE9rsG~BrF&yo6F1-b^
zBz(u{zDQ6FExO1%x*f=|9InsQy%3_bJ?Zt?msq_Lzc^IbeG@c42umSAiGii;M{N}@
z7q2d(4N(UFR+Sf5!ti~2nPE?J7m-c-P)u2PMH=jQQA-dG(gg`sHk=m(2VBT4lJ4~f
zt^QP0_F@52RGJ19=_^Gs%syuz5`Ci;8IB2}LLVH*2(%y~TW)q!&Z%+ZEp@~)mXPO*
zi4bt0jZ(kd0ZhrkmpIx|2m5E<&-mv<QQ|^${C4`yNkWpE*NEzRGT2<ulkk9dwBF}r
zxAXU2EdQeSDNwD%b;mr5E*%dfN3hVE=`NA!E9EHC)=phC9i8=fII_u_4^H2;d?c$j
zBJ?LY3PTV5z*{tuNi5}56(s7qTfrl(GzS?Y|4}D0F!JmsKanHx6+U~-%0bhtbm*HS
zSzDZ3W|ry*K8^&cY)L+{)T8s{j}r<)C33v+!zat})0;P?`2moNAeiA&kGtJ^hEaEo
zvo&*?1D-27v=ef6vpjPxDV#~%q|2^FNU@)3wZJ$%)J*()Vo}3r`$V%lwf{%U{_HU2
z>feLBd-}a+_dxx}B#a*24|K}^NOqA>6%d@QDPDT|Ig>{;%<d>fHym=B_uSd8e;=L)
zY^^HZ+F<X1pi~I%CYxrWu?nUq-tZ-PtDuw*+|>@idoq-Y{kzZPtufe}Np3%N3%?f*
zelNjJZ(d>vKpZ3{Aq<id78f@Gfxr?nU~ySNkT@6wlHwQ={67Mo-Y?vogZ_U34XAGh
yR)GFL4bQxt{Q?}`yaWUU1c<nKdH6ax_`DSHe&dq8C(nQ#1kh5~SF2L7kN6+cb#zPs

diff --git a/srcpkgs/oracle-jre/files/oracle-jre-vars.sh.in b/srcpkgs/oracle-jre/files/oracle-jre-vars.sh.in
deleted file mode 100644
index 6d805b20a23..00000000000
--- a/srcpkgs/oracle-jre/files/oracle-jre-vars.sh.in
+++ /dev/null
@@ -1 +0,0 @@
-export ORACLE_JRE_URL="%ORACLE_JRE_URL%" ORACLE_JRE_CHECKSUM="%ORACLE_JRE_CHECKSUM%" ORACLE_JRE_LONG_VERSION="%LONG_VERSION%"
diff --git a/srcpkgs/oracle-jre/files/oracle-jre.sh b/srcpkgs/oracle-jre/files/oracle-jre.sh
deleted file mode 100644
index b6188c1b311..00000000000
--- a/srcpkgs/oracle-jre/files/oracle-jre.sh
+++ /dev/null
@@ -1 +0,0 @@
-export JAVA_HOME=/usr/lib/jvm/oracle-jre
diff --git a/srcpkgs/oracle-jre/template b/srcpkgs/oracle-jre/template
deleted file mode 100644
index ee72dec2c00..00000000000
--- a/srcpkgs/oracle-jre/template
+++ /dev/null
@@ -1,92 +0,0 @@
-# Template file for 'oracle-jre'
-pkgname=oracle-jre
-version=8u202
-revision=1
-
-_longVersion=1.${version%u*}.0_${version#*u}
-_build=08
-_tag=1961070e4c9b4e26a04e7f5a083f551e
-
-short_desc="Java Runtime Environment (JRE)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
-license="oracle"
-lib32disabled=yes
-repository="nonfree"
-archs="i686 x86_64"
-depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget"
-hostmakedepends="wget"
-provides="java-runtime-${version}_1"
-
-
-case "${XBPS_TARGET_MACHINE}" in
-x86_64)
-	_arch=amd64
-	_filename=jre-${version}-linux-x64.tar.gz
-	checksum=9efb1493fcf636e39c94f47bacf4f4324821df2d3aeea2dc3ea1bdc86428cb82
-	;;
-i686)
-	_arch=i386
-	_filename=jre-${version}-linux-i586.tar.gz
-	checksum=12832f354fea65b8df31ee2b28faa4c7a673e0c0a8660c9d0daa5b68aee83e4c
-	;;
-esac
-
-alternatives="
- java:/usr/bin/java:/usr/lib/jvm/oracle-jre/bin/java
- java:/usr/bin/javaws:/usr/lib/jvm/oracle-jre/bin/javaws
- java:/usr/bin/jcontrol:/usr/lib/jvm/oracle-jre/bin/jcontrol
- java:/usr/bin/jjs:/usr/lib/jvm/oracle-jre/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/oracle-jre/bin/keytool
- java:/usr/bin/orbd:/usr/lib/jvm/oracle-jre/bin/orbd
- java:/usr/bin/pack200:/usr/lib/jvm/oracle-jre/bin/pack200
- java:/usr/bin/policytool:/usr/lib/jvm/oracle-jre/bin/policytool
- java:/usr/bin/rmid:/usr/lib/jvm/oracle-jre/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/oracle-jre/bin/rmiregistry
- java:/usr/bin/servertool:/usr/lib/jvm/oracle-jre/bin/servertool
- java:/usr/bin/tnameserv:/usr/lib/jvm/oracle-jre/bin/tnameserv
- java:/usr/bin/unpack200:/usr/lib/jvm/oracle-jre/bin/unpack200
-
- java-plugin:/usr/lib/mozilla/plugins/libnpjp2.so:/usr/lib/jvm/oracle-jre/lib/$_arch/libnpjp2.so
-"
-
-distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b${_build}/$_tag/${_filename}"
-wrksrc="jre$_longVersion"
-
-do_fetch() {
-	mkdir -p $wrksrc
-	cd $wrksrc
-	wget \
-		--no-check-certificate \
-		--header "Cookie: oraclelicense=accept-securebackup-cookie" \
-		--progress=bar:force \
-		-c -O $_filename \
-		$distfiles
-	echo "$checksum  $_filename" | sha256sum -c || { sha256sum "$_filename"; return 1; }
-}
-
-do_extract() {
-	tar xf $_filename -C ..
-}
-
-do_build() {
-	sed \
-		-e "s|%LONG_VERSION%|${_longVersion}|" \
-		-e "s|%ORACLE_JRE_URL%|${distfiles}|" \
-		-e "s|%ORACLE_JRE_CHECKSUM%|${checksum}|" \
-			${FILESDIR}/oracle-jre-vars.sh.in > oracle-jre-vars.sh
-}
-
-do_install() {
-	vinstall oracle-jre-vars.sh 644 "usr/lib/jvm/"
-
-	vlicense LICENSE
-	vinstall $FILESDIR/java-policy-settings.desktop 644 usr/share/applications
-	ln -sf jre${_longVersion} ${DESTDIR}/usr/lib/jvm/oracle-jre
-
-	for i in 16 20 22 24 32 40 48 64 72 96 128 256 512; do
-		vinstall $FILESDIR/oracle-jre-${i}x${i}.png 644 usr/share/icons/hicolor/${i}x${i}/apps oracle-java.png
-	done
-
-	vinstall $FILESDIR/oracle-jre.sh 644 "etc/profile.d" 10_oracle-jre.sh
-}
diff --git a/srcpkgs/oracle-jre/update b/srcpkgs/oracle-jre/update
deleted file mode 100644
index 3bd797c1e12..00000000000
--- a/srcpkgs/oracle-jre/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern=">Java SE \K[^< ]+(?=[< ])"

From 594d5ba18bbbdd55e6491e88603fd6b4ddf66419 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 3 Aug 2020 10:26:17 -0400
Subject: [PATCH 249/298] dracut: avoid double copies in dracut-uefi subpackage

---
 srcpkgs/dracut/template | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 5dad17021f3..8bde309e867 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -28,7 +28,6 @@ esac
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) # archs supported by dracut for EFI bundle
-		_efi_bundle=1
 		subpackages+=" dracut-uefi"
 	;;
 esac
@@ -49,12 +48,6 @@ post_install() {
 	vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 20-dracut
 	vinstall ${FILESDIR}/kernel-hook-postrm 755 etc/kernel.d/post-remove 20-dracut
 
-	if [ "${_efi_bundle}" ]; then
-		vinstall ${FILESDIR}/dracut-uefi-hook.confd 644 etc/default dracut-uefi-hook
-		vinstall ${FILESDIR}/kernel-uefi-hook-postinst 755 etc/kernel.d/post-install 20-dracut-uefi
-		vinstall ${FILESDIR}/kernel-uefi-hook-postrm 755 etc/kernel.d/post-remove 20-dracut-uefi
-	fi
-
 	# We don't need the systemd stuff.
 	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*systemd*
 	rm -f ${DESTDIR}/usr/share/man/man8/*.service.*
@@ -62,7 +55,7 @@ post_install() {
 }
 
 dracut-network_package() {
-	depends="dhclient dracut-${version}_${revision}"
+	depends="dhclient ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - network modules"
 	archs=noarch
 	pkg_install() {
@@ -74,12 +67,13 @@ dracut-network_package() {
 }
 
 dracut-uefi_package() {
-	depends="binutils gummiboot dracut-${version}_${revision}"
+	depends="binutils gummiboot ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - UEFI bundle hook"
 	conf_files="/etc/default/dracut-uefi-hook"
+
 	pkg_install() {
-		vmove etc/kernel.d/post-install/20-dracut-uefi
-		vmove etc/kernel.d/post-remove/20-dracut-uefi
-		vmove etc/default/dracut-uefi-hook
+		vinstall ${FILESDIR}/dracut-uefi-hook.confd 644 etc/default dracut-uefi-hook
+		vinstall ${FILESDIR}/kernel-uefi-hook-postinst 755 etc/kernel.d/post-install 20-dracut-uefi
+		vinstall ${FILESDIR}/kernel-uefi-hook-postrm 755 etc/kernel.d/post-remove 20-dracut-uefi
 	}
 }

From 6ac7f688efa877692ab1391f0f8f45b01eb87534 Mon Sep 17 00:00:00 2001
From: Daniel Santana <daniel@santana.tech>
Date: Sat, 1 Aug 2020 18:30:34 -0300
Subject: [PATCH 250/298] pex: update to 2.1.15.

---
 srcpkgs/pex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pex/template b/srcpkgs/pex/template
index 0c269cc733a..105fb3e896d 100644
--- a/srcpkgs/pex/template
+++ b/srcpkgs/pex/template
@@ -1,6 +1,6 @@
 # Template file for 'pex'
 pkgname=pex
-version=2.1.14
+version=2.1.15
 revision=1
 archs=noarch
 wrksrc="pex-${version}"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/pantsbuild/pex"
 changelog="https://raw.githubusercontent.com/pantsbuild/pex/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/pex/pex-${version}.tar.gz"
-checksum=de5e553086cf65241beee7c1f06b30867149511fa6e48c8d4493305c7ddaf69b
+checksum=e1092ae52cfdef41c22d98fa98f9225ac21936a7d096131777ca3a7940fe1b2d
 
 post_build() {
 	PYTHONPATH="$PWD" make -C docs man

From e8da3460fc31e424233ce180cf6e69b7079ea8c2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 3 Aug 2020 20:32:28 +0200
Subject: [PATCH 251/298] libvirt: update to 6.6.0.

---
 srcpkgs/libvirt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 53c90d9f1b0..d04f053fb7b 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=6.5.0
+version=6.6.0
 revision=1
 build_wrksrc="build"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=4915d9eab299ed79288d7598b717c587156708c05f701fe55a72293f32eb3182
+checksum=94e52ddd2d71b650e1a7eb5ab7e651f9607ecee207891216714020b8ff081ef9
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From e9a17cda9e753b0ccf86d439d89f855ecd803b28 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 3 Aug 2020 20:36:13 +0200
Subject: [PATCH 252/298] libvirt-python3: update to 6.6.0.

---
 srcpkgs/libvirt-python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index f96c64439b2..27137c42529 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=6.5.0
+version=6.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=2cc8ad5cad9c85ae85049fa4163642b4de4052219719bbdc5d1f8faa6f4a22a9
+checksum=68763f7b7b955032665aa4e0ea0668fc45067574bf2bf6b9f091ffdfd71aea25

From 3b556cd0e8e1d4b96182c215a3708c1a773304bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 29 Jul 2020 21:23:42 +0200
Subject: [PATCH 253/298] scryer-prolog: use system gmp

---
 srcpkgs/scryer-prolog/template | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 217ae275fd1..3868993d0dd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -1,24 +1,18 @@
 # Template file for 'scryer-prolog'
 pkgname=scryer-prolog
 version=0.8.123
-revision=1
-archs="~i686" # aggresive cpu detection
+revision=2
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-depends="gmp"
+makedepends="gmp-devel mpfr-devel libmpc-devel"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	# XXX: Also should have GMP_MPFR_SYS_CACHE="" set somewhere https://crates.io/crates/gmp-mpfr-sys (we have ccache for that)
-	# We might also want to use system libs instead
-	# the runtime dep on gmp is incorrect right now, since gmp is statically linked
-	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/29779/steps/shell_3/logs/stdio"
-fi
+nocross="executes gmp header https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/v1.2.2/build.rs#L1278"
+export CARGO_FEATURE_USE_SYSTEM_LIBS=1
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 3a24d2ad627c5f3b36e6de69aba0b3413e9f48ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 254/298] python3-macaroons: switch from python3-nacl to
 python3-pynacl

---
 srcpkgs/python3-macaroons/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-macaroons/template b/srcpkgs/python3-macaroons/template
index 420f5aff043..7dfb4f3f588 100644
--- a/srcpkgs/python3-macaroons/template
+++ b/srcpkgs/python3-macaroons/template
@@ -1,13 +1,12 @@
 # Template file for 'python3-macaroons'
 pkgname=python3-macaroons
 version=0.13.0
-revision=2
+revision=3
 archs=noarch
 wrksrc="pymacaroons-${version}"
 build_style=python3-module
-pycompile_module="pymacaroons"
 hostmakedepends="python3-setuptools"
-depends="python3-six>=1.8.0 python3-nacl>=1.1.2 python3-nacl<2.0"
+depends="python3-six python3-pynacl"
 short_desc="Python3 Macaroon library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From aa50a1e7369bc493ef26b8564e79ea5c44401364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 255/298] python3-signedjson: switch from python3-nacl to
 python3-pynacl

---
 srcpkgs/python3-signedjson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index 389d2903612..5002ade8f79 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-signedjson'
 pkgname=python3-signedjson
 version=1.1.0
-revision=1
+revision=2
 archs=noarch
 wrksrc="python-signedjson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-canonicaljson>=1.0.0 python3-unpaddedbase64>=1.0.1
- python3-nacl>=0.3.0"
+ python3-pynacl"
 short_desc="Sign JSON with Ed25519 signatures"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From dea7e50bbe7522ea864ad8b0777982585668c499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 256/298] synapse: switch from python3-nacl to python3-pynacl

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index bb5fcd0d95d..e47fc074253 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,12 +1,12 @@
 # Template file for 'synapse'
 pkgname=synapse
 version=1.17.0
-revision=1
+revision=2
 archs=noarch
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
- python3-signedjson python3-nacl python3-service_identity python3-Twisted
+ python3-signedjson python3-pynacl python3-service_identity python3-Twisted
  python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
  python3-daemonize python3-bcrypt python3-Pillow python3-psutil
  python3-msgpack python3-phonenumbers python3-prometheus_client<0.8.0

From 4b2f975ff85dc9d10c2700f3b6dbff72bfc9e617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 257/298] python3-nacl: remove as duplicate of python3-pynacl

---
 srcpkgs/python-pynacl/template | 13 +++++++++----
 srcpkgs/python3-nacl           |  1 +
 srcpkgs/python3-nacl/template  | 24 ------------------------
 3 files changed, 10 insertions(+), 28 deletions(-)
 create mode 120000 srcpkgs/python3-nacl
 delete mode 100644 srcpkgs/python3-nacl/template

diff --git a/srcpkgs/python-pynacl/template b/srcpkgs/python-pynacl/template
index 7a7fe246821..6de29f2459f 100644
--- a/srcpkgs/python-pynacl/template
+++ b/srcpkgs/python-pynacl/template
@@ -1,27 +1,32 @@
 # Template file for 'python-pynacl'
 pkgname=python-pynacl
 version=1.3.0
-revision=2
+revision=4
 wrksrc="PyNaCl-${version}"
 build_style=python-module
-pycompile_module="nacl"
 hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi"
 makedepends="python-devel python3-devel python-cffi python3-cffi libsodium-devel"
 depends="python-cffi python-six"
+checkdepends="${depends} python-hypothesis python-more-itertools python-parsing"
 short_desc="Python2 binding to the Networking and Cryptography (NaCl) library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pyca/pynacl/"
 license="Apache-2.0"
+homepage="https://github.com/pyca/pynacl/"
 distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
 checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
 
 export SODIUM_INSTALL=system
 
 python3-pynacl_package() {
-	pycompile_module="nacl"
 	depends="python3-cffi python3-six"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*
 	}
 }
+
+python3-nacl_package() {
+	build_style=meta
+	depends="python3-pynacl"
+	short_desc="${short_desc/Python2/Python3} - dummy transitional package"
+}
diff --git a/srcpkgs/python3-nacl b/srcpkgs/python3-nacl
new file mode 120000
index 00000000000..5738ec6f9cf
--- /dev/null
+++ b/srcpkgs/python3-nacl
@@ -0,0 +1 @@
+python-pynacl
\ No newline at end of file
diff --git a/srcpkgs/python3-nacl/template b/srcpkgs/python3-nacl/template
deleted file mode 100644
index cfbb29e03db..00000000000
--- a/srcpkgs/python3-nacl/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-nacl'
-pkgname=python3-nacl
-version=1.3.0
-revision=3
-wrksrc="PyNaCl-${version}"
-build_style=python3-module
-pycompile_module="nacl"
-hostmakedepends="python3-setuptools python3-pycparser python3-cffi"
-makedepends="libsodium-devel python3-devel libffi-devel"
-depends="python3-six python3-cffi"
-short_desc="Python3 bindings for the NaCl library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/pyca/pynacl/"
-distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
-checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
-
-pre_build() {
-	export SODIUM_INSTALL=system
-}
-
-pre_install() {
-	export SODIUM_INSTALL=system
-}

From 5bf917da7170a559be5b44f58077ba2b1880239e Mon Sep 17 00:00:00 2001
From: Daniel Santana <daniel@santana.tech>
Date: Tue, 28 Jul 2020 00:31:27 -0300
Subject: [PATCH 258/298] sshuttle: update to 1.0.3.

---
 srcpkgs/sshuttle/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sshuttle/template b/srcpkgs/sshuttle/template
index 449ff79af13..518bbd264c3 100644
--- a/srcpkgs/sshuttle/template
+++ b/srcpkgs/sshuttle/template
@@ -1,6 +1,6 @@
 # Template file for 'sshuttle'
 pkgname=sshuttle
-version=1.0.2
+version=1.0.3
 revision=1
 archs=noarch
 build_style=python3-module
@@ -10,8 +10,9 @@ short_desc="Transparent proxy server that forwards TCP packets over ssh"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/sshuttle/sshuttle"
+changelog="https://github.com/sshuttle/sshuttle/raw/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/sshuttle/sshuttle-${version}.tar.gz"
-checksum=e17d2afaec3c123e1fd061590e8bcc9ab17a5eb280ec34bc6b0732aa8ec88309
+checksum=0fff1c88669a20bb6a4e7331960673a3a02a2e04ff163e4c9299496646edcf61
 
 post_extract() {
 	sed -i setup.py \

From 3dacbdaf0e3b653b34d99c5ed58cfb89620a418d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 30 Jul 2020 09:12:01 -0500
Subject: [PATCH 259/298] nano: update to 5.0.

Also set site for the update-check to see latest version (i.e. 6.x).
---
 srcpkgs/nano/template | 6 +++---
 srcpkgs/nano/update   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/nano/update

diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index 1a0a2e08a0d..0bfda604638 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
 # Template file for 'nano'
 pkgname=nano
-version=4.9.3
+version=5.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-utf8"
@@ -10,8 +10,8 @@ maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.nano-editor.org/"
 changelog="http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS"
-distfiles="https://www.nano-editor.org/dist/v4/nano-${version}.tar.xz"
-checksum=6e3438f033a0ed07d3d74c30d0803cbda3d2366ba1601b7bbf9b16ac371f51b4
+distfiles="https://www.nano-editor.org/dist/v${version%%.*}/nano-${version}.tar.xz"
+checksum=7c0d94be69cd066f20df2868a2da02f7b1d416ce8d47c0850a8bd270897caa36
 
 post_install() {
 	vsconf syntax/nanorc.nanorc
diff --git a/srcpkgs/nano/update b/srcpkgs/nano/update
new file mode 100644
index 00000000000..ec5a054db94
--- /dev/null
+++ b/srcpkgs/nano/update
@@ -0,0 +1 @@
+site="https://www.nano-editor.org/dist/latest"

From 925f15747f0f9268e3016f678b5383f5d04aaa9a Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 2 Aug 2020 11:18:15 +0200
Subject: [PATCH 260/298] git-toolbelt: update to 1.5.0.

---
 srcpkgs/git-toolbelt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-toolbelt/template b/srcpkgs/git-toolbelt/template
index 2ead57bd9ba..e79805ad5b0 100644
--- a/srcpkgs/git-toolbelt/template
+++ b/srcpkgs/git-toolbelt/template
@@ -1,6 +1,6 @@
 # Template file for 'git-toolbelt'
 pkgname=git-toolbelt
-version=1.4.2
+version=1.5.0
 revision=1
 archs=noarch
 depends="git moreutils fzf"
@@ -9,7 +9,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/nvie/git-toolbelt"
 distfiles="https://github.com/nvie/git-toolbelt/archive/v${version}.tar.gz"
-checksum=0a4eb4f4106c5a43de5bd0b3f640e817e0fc001def08586b5929248c80d9bde2
+checksum=8f9218c3f182462085292a4947253da5459617a0d8cf36f9038905d341e722a2
 conflicts="git-extras"
 
 do_install() {

From 899d31eb5ec6333d890867231f7028fbdcb7ee0b Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Sun, 2 Aug 2020 13:10:06 +0200
Subject: [PATCH 261/298] slack-desktop: update to 4.8.0

---
 srcpkgs/slack-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index f23fa0a1bc0..431244b57ee 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.7.0
+version=4.8.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=83a7fc575f77faca1771762cb97eaa8649092295f33ac62098e92bc5c0a19edb
+checksum=60febe824334cbc33e4c63e7ac133a53efc325447405fc8a3ffa426ecbbf1861
 restricted=yes
 repository="nonfree"
 nopie=yes

From 6abd8e7c0a25adb9c4c5cb536b972a26273cb824 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 3 Aug 2020 22:59:01 +0200
Subject: [PATCH 262/298] linux5.7: new config for arm64

the previous config was questionable to the point of being
generally useless, i doubt it really ran on any real hardware,
or at least i doubt it ran well

this new config is mostly based on opensuse tumbleweed's aarch64
config, with the suse bits ripped out, general non-driver/harwdare
choices synced with other void configs for other architectures
(stuff like security modules, hugepage settings, module settings,
and disablement of deprecated syscalls and drivers)

this is a 4k pages kernel, as that's the universal and reliable
option that won't have trouble with software and filesystems (old
kernel was 64k, which aarch64 supports but that has similar issues
to 64k kernels on other archs like POWER)

tested on solidrun honeycomb lx2k with EFI
---
 srcpkgs/linux5.7/files/arm64-dotconfig | 5479 ++++++++++++++----------
 1 file changed, 3137 insertions(+), 2342 deletions(-)

diff --git a/srcpkgs/linux5.7/files/arm64-dotconfig b/srcpkgs/linux5.7/files/arm64-dotconfig
index 717e3fa91dd..e9aba1a0486 100644
--- a/srcpkgs/linux5.7/files/arm64-dotconfig
+++ b/srcpkgs/linux5.7/files/arm64-dotconfig
@@ -1,14 +1,14 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.7.8 Kernel Configuration
+# Linux/arm64 5.7.12 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-musl-gcc (GCC) 9.3.0
+# Compiler: gcc (GCC) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
+CONFIG_LD_VERSION=234000000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -49,6 +49,7 @@ CONFIG_GENERIC_IRQ_INJECTION=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_SIM=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
 CONFIG_GENERIC_MSI_IRQ=y
@@ -74,6 +75,8 @@ CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
+CONFIG_CONTEXT_TRACKING=y
+# CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # end of Timers subsystem
@@ -85,10 +88,10 @@ CONFIG_PREEMPT_VOLUNTARY=y
 #
 # CPU/Task time and stats accounting
 #
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+CONFIG_VIRT_CPU_ACCOUNTING=y
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_HAVE_SCHED_AVG_IRQ=y
 CONFIG_SCHED_THERMAL_PRESSURE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -131,20 +134,22 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_SWAP_ENABLED=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
@@ -162,7 +167,7 @@ CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SCHED_AUTOGROUP is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
@@ -212,7 +217,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
-# CONFIG_USERFAULTFD is not set
+CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
@@ -236,7 +241,7 @@ CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
+CONFIG_SLAB_FREELIST_HARDENED=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
@@ -247,11 +252,11 @@ CONFIG_TRACEPOINTS=y
 CONFIG_ARM64=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
-CONFIG_ARM64_PAGE_SHIFT=16
-CONFIG_ARM64_CONT_SHIFT=5
-CONFIG_ARCH_MMAP_RND_BITS_MIN=14
-CONFIG_ARCH_MMAP_RND_BITS_MAX=29
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
+CONFIG_ARM64_PAGE_SHIFT=12
+CONFIG_ARM64_CONT_SHIFT=4
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
@@ -269,7 +274,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_SMP=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=3
+CONFIG_PGTABLE_LEVELS=4
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 
@@ -277,7 +282,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 # Platform selection
 #
 CONFIG_ARCH_ACTIONS=y
-# CONFIG_ARCH_AGILEX is not set
+CONFIG_ARCH_AGILEX=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_ALPINE=y
 CONFIG_ARCH_BCM2835=y
@@ -296,9 +301,9 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_MXC=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_REALTEK=y
-CONFIG_ARCH_RENESAS=y
+# CONFIG_ARCH_RENESAS is not set
 CONFIG_ARCH_ROCKCHIP=y
-# CONFIG_ARCH_S32 is not set
+CONFIG_ARCH_S32=y
 CONFIG_ARCH_SEATTLE=y
 CONFIG_ARCH_STRATIX10=y
 CONFIG_ARCH_SYNQUACER=y
@@ -306,7 +311,7 @@ CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_SPRD=y
 CONFIG_ARCH_THUNDER=y
 CONFIG_ARCH_THUNDER2=y
-CONFIG_ARCH_UNIPHIER=y
+# CONFIG_ARCH_UNIPHIER is not set
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 CONFIG_ARCH_ZX=y
@@ -340,6 +345,7 @@ CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
 CONFIG_CAVIUM_ERRATUM_30115=y
@@ -354,23 +360,25 @@ CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_FUJITSU_ERRATUM_010001=y
 # end of ARM errata workarounds via the alternatives framework
 
-# CONFIG_ARM64_4K_PAGES is not set
+CONFIG_ARM64_4K_PAGES=y
 # CONFIG_ARM64_16K_PAGES is not set
-CONFIG_ARM64_64K_PAGES=y
-# CONFIG_ARM64_VA_BITS_42 is not set
+# CONFIG_ARM64_64K_PAGES is not set
+# CONFIG_ARM64_VA_BITS_39 is not set
 CONFIG_ARM64_VA_BITS_48=y
-# CONFIG_ARM64_VA_BITS_52 is not set
 CONFIG_ARM64_VA_BITS=48
 CONFIG_ARM64_PA_BITS_48=y
-# CONFIG_ARM64_PA_BITS_52 is not set
 CONFIG_ARM64_PA_BITS=48
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
-CONFIG_NR_CPUS=8
+CONFIG_NR_CPUS=480
 CONFIG_HOTPLUG_CPU=y
-# CONFIG_NUMA is not set
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=6
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_HOLES_IN_ZONE=y
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
@@ -382,19 +390,18 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_SECCOMP=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+# CONFIG_PARAVIRT is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
-CONFIG_KEXEC_FILE=y
-# CONFIG_KEXEC_SIG is not set
-# CONFIG_CRASH_DUMP is not set
+# CONFIG_KEXEC_FILE is not set
+CONFIG_CRASH_DUMP=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
@@ -402,11 +409,14 @@ CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
+# CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_COMPAT=y
 CONFIG_KUSER_HELPERS=y
-# CONFIG_ARMV8_DEPRECATED is not set
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
 
 #
 # ARMv8.1 architectural features
@@ -430,9 +440,11 @@ CONFIG_ARM64_CNP=y
 #
 # ARMv8.3 architectural features
 #
+CONFIG_ARM64_PTR_AUTH=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
 CONFIG_AS_HAS_PAC=y
+CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
 # end of ARMv8.3 architectural features
 
 #
@@ -450,7 +462,8 @@ CONFIG_ARCH_RANDOM=y
 
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_MODULE_PLTS=y
-# CONFIG_ARM64_PSEUDO_NMI is not set
+CONFIG_ARM64_PSEUDO_NMI=y
+# CONFIG_ARM64_DEBUG_PRIORITY_MASKING is not set
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
@@ -462,8 +475,7 @@ CONFIG_STACKPROTECTOR_PER_TASK=y
 # Boot options
 #
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
-CONFIG_CMDLINE="console=ttyAMA0"
-# CONFIG_CMDLINE_FORCE is not set
+CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
 CONFIG_DMI=y
@@ -478,17 +490,22 @@ CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SUSPEND_SKIP_SYNC is not set
-# CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_ADVANCED_DEBUG is not set
-CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_DPM_WATCHDOG is not set
+CONFIG_DPM_WATCHDOG=y
+CONFIG_DPM_WATCHDOG_TIMEOUT=60
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
@@ -497,6 +514,7 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_CPU_PM=y
 CONFIG_ENERGY_MODEL=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_HIBERNATION_HEADER=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # end of Power management options
 
@@ -529,54 +547,58 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 
 #
 # CPU frequency scaling drivers
 #
-CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT=m
 CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_ACPI_CPPC_CPUFREQ=y
+CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
-# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
 CONFIG_ARM_ARMADA_8K_CPUFREQ=m
-CONFIG_ARM_SCPI_CPUFREQ=y
-CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y
-# CONFIG_ARM_IMX_CPUFREQ_DT is not set
+CONFIG_ARM_SCPI_CPUFREQ=m
+CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=m
+CONFIG_ARM_IMX_CPUFREQ_DT=m
 CONFIG_ARM_MEDIATEK_CPUFREQ=m
 CONFIG_ARM_QCOM_CPUFREQ_NVMEM=m
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
-CONFIG_ARM_TEGRA20_CPUFREQ=y
+CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
+CONFIG_ARM_SCMI_CPUFREQ=m
+# CONFIG_ARM_TEGRA20_CPUFREQ is not set
 CONFIG_ARM_TEGRA124_CPUFREQ=y
-CONFIG_ARM_TEGRA186_CPUFREQ=y
-# CONFIG_QORIQ_CPUFREQ is not set
+CONFIG_ARM_TEGRA186_CPUFREQ=m
+CONFIG_QORIQ_CPUFREQ=m
 # end of CPU Frequency scaling
 # end of CPU Power Management
 
 #
 # Firmware Drivers
 #
-# CONFIG_ARM_SCMI_PROTOCOL is not set
-CONFIG_ARM_SCPI_PROTOCOL=y
-CONFIG_ARM_SCPI_POWER_DOMAIN=y
-# CONFIG_ARM_SDE_INTERFACE is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_SCMI_POWER_DOMAIN=m
+CONFIG_ARM_SCPI_PROTOCOL=m
+CONFIG_ARM_SCPI_POWER_DOMAIN=m
+CONFIG_ARM_SDE_INTERFACE=y
+CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=y
-# CONFIG_ISCSI_IBFT is not set
+CONFIG_DMI_SYSFS=m
+CONFIG_ISCSI_IBFT=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
-# CONFIG_FW_CFG_SYSFS is not set
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_FW_CFG_SYSFS_CMDLINE=y
 CONFIG_INTEL_STRATIX10_SERVICE=m
 CONFIG_INTEL_STRATIX10_RSU=m
 CONFIG_QCOM_SCM=y
@@ -592,16 +614,17 @@ CONFIG_ARM_PSCI_FW=y
 #
 CONFIG_EFI_VARS=y
 CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=y
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_PARAMS_FROM_FDT=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_ARMSTUB=y
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-CONFIG_EFI_BOOTLOADER_CONTROL=y
-# CONFIG_EFI_CAPSULE_LOADER is not set
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=m
 # CONFIG_EFI_TEST is not set
-CONFIG_RESET_ATTACK_MITIGATION=y
+# CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # end of EFI (Extensible Firmware Interface) Support
 
@@ -609,9 +632,10 @@ CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_ARM=y
 CONFIG_EFI_EARLYCON=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
-# CONFIG_IMX_DSP is not set
+CONFIG_IMX_DSP=m
 CONFIG_IMX_SCU=y
-# CONFIG_IMX_SCU_PD is not set
+CONFIG_IMX_SCU_PD=y
+CONFIG_MESON_SM=y
 
 #
 # Tegra firmware driver
@@ -634,12 +658,12 @@ CONFIG_ACPI_GENERIC_GSI=y
 CONFIG_ACPI_CCA_REQUIRED=y
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_EC_DEBUGFS=y
-CONFIG_ACPI_AC=y
-CONFIG_ACPI_BATTERY=y
+# CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_FAN=y
-# CONFIG_ACPI_TAD is not set
+CONFIG_ACPI_TAD=m
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
 CONFIG_ACPI_MCFG=y
@@ -648,28 +672,36 @@ CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_CUSTOM_DSDT_FILE=""
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=y
-# CONFIG_ACPI_BGRT is not set
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
 CONFIG_ACPI_NFIT=m
 # CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_HMAT=y
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_ACPI_APEI=y
-# CONFIG_ACPI_APEI_GHES is not set
-# CONFIG_ACPI_APEI_PCIEAER is not set
-# CONFIG_ACPI_APEI_EINJ is not set
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_SEA=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_WATCHDOG=y
 CONFIG_PMIC_OPREGION=y
 CONFIG_ACPI_CONFIGFS=m
 CONFIG_ACPI_IORT=y
 CONFIG_ACPI_GTDT=y
 CONFIG_ACPI_PPTT=y
+# CONFIG_TPS68470_PMIC_OPREGION is not set
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
 CONFIG_HAVE_KVM_IRQ_ROUTING=y
@@ -689,21 +721,21 @@ CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM_ARM_PMU=y
 CONFIG_KVM_INDIRECT_VECTORS=y
 CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=y
+CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM64=m
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-# CONFIG_CRYPTO_SHA512_ARM64_CE is not set
-# CONFIG_CRYPTO_SHA3_ARM64 is not set
-# CONFIG_CRYPTO_SM3_ARM64_CE is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_SM4_ARM64_CE=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=m
+CONFIG_CRYPTO_AES_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_POLY1305_NEON=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
@@ -766,9 +798,9 @@ CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=14
+CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=7
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_HAVE_COPY_THREAD_TLS=y
 CONFIG_CLONE_BACKWARDS=y
@@ -795,16 +827,13 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MODVERSIONS=y
@@ -813,9 +842,11 @@ CONFIG_ASM_MODVERSIONS=y
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-CONFIG_UNUSED_SYMBOLS=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
+CONFIG_BLK_RQ_ALLOC_TIME=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG=y
@@ -825,10 +856,10 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
-CONFIG_BLK_CMDLINE_PARSER=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
 CONFIG_BLK_WBT=y
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
-# CONFIG_BLK_CGROUP_IOCOST is not set
+CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEBUG_FS_ZONED=y
@@ -839,30 +870,31 @@ CONFIG_BLK_DEBUG_FS_ZONED=y
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
+# CONFIG_AIX_PARTITION is not set
 CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-# CONFIG_ATARI_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+CONFIG_ATARI_PARTITION=y
 CONFIG_MAC_PARTITION=y
 CONFIG_MSDOS_PARTITION=y
 CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
+# CONFIG_MINIX_SUBPARTITION is not set
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_LDM_PARTITION=y
 # CONFIG_LDM_DEBUG is not set
 CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
+CONFIG_SYSV68_PARTITION=y
 # CONFIG_CMDLINE_PARTITION is not set
 # end of Partition Types
 
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
 CONFIG_BLK_PM=y
 
 #
@@ -949,7 +981,7 @@ CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=y
+CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
 # end of Executable file formats
 
@@ -957,17 +989,22 @@ CONFIG_COREDUMP=y
 # Memory Management options
 #
 CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_HAVE_FAST_GUP=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_NUMA_KEEP_MEMINFO=y
 CONFIG_MEMORY_ISOLATION=y
-# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
+CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -979,15 +1016,18 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
-CONFIG_CMA_DEBUGFS=y
+# CONFIG_CMA_DEBUGFS is not set
 CONFIG_CMA_AREAS=7
 CONFIG_ZSWAP=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
@@ -1004,17 +1044,22 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
 # CONFIG_ZSWAP_DEFAULT_ON is not set
 CONFIG_ZPOOL=y
 CONFIG_ZBUD=y
-# CONFIG_Z3FOLD is not set
+CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
 # CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
+CONFIG_DEVICE_PRIVATE=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
+CONFIG_READ_ONLY_THP_FOR_FS=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 # end of Memory Management options
 
@@ -1028,32 +1073,41 @@ CONFIG_SKB_EXTENSIONS=y
 #
 # Networking options
 #
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
+CONFIG_TLS=m
+CONFIG_TLS_DEVICE=y
+# CONFIG_TLS_TOE is not set
 CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
+# CONFIG_XFRM_STATISTICS is not set
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_SMC=m
+CONFIG_SMC_DIAG=m
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IP_TUNNEL=m
@@ -1071,7 +1125,7 @@ CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
+CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
@@ -1105,12 +1159,12 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
+CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
@@ -1137,7 +1191,7 @@ CONFIG_MPTCP_IPV6=y
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_BRIDGE_NETFILTER=m
@@ -1220,14 +1274,14 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
+CONFIG_NFT_SYNPROXY=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XTABLES=m
 
 #
 # Xtables combined modules
@@ -1239,7 +1293,7 @@ CONFIG_NETFILTER_XT_SET=m
 #
 # Xtables targets
 #
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -1364,7 +1418,7 @@ CONFIG_IP_VS_LBLC=m
 CONFIG_IP_VS_LBLCR=m
 CONFIG_IP_VS_DH=m
 CONFIG_IP_VS_SH=m
-# CONFIG_IP_VS_MH is not set
+CONFIG_IP_VS_MH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
@@ -1400,11 +1454,11 @@ CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=y
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_RPFILTER=m
@@ -1464,8 +1518,11 @@ CONFIG_IP6_NF_TARGET_NPT=m
 # end of IPv6: Netfilter Configuration
 
 CONFIG_NF_DEFRAG_IPV6=m
-# CONFIG_NF_TABLES_BRIDGE is not set
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1487,7 +1544,8 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
+CONFIG_BPFILTER=y
+# CONFIG_BPFILTER_UMH is not set
 CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
@@ -1508,16 +1566,18 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
 CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_COOKIE_HMAC_SHA1 is not set
 CONFIG_INET_SCTP_DIAG=m
 CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
 CONFIG_RDS_TCP=m
 # CONFIG_RDS_DEBUG is not set
 CONFIG_TIPC=m
+# CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
 CONFIG_TIPC_CRYPTO=y
 CONFIG_TIPC_DIAG=m
@@ -1525,7 +1585,7 @@ CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
-# CONFIG_ATM_MPOA is not set
+CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_L2TP=m
@@ -1542,7 +1602,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_TAG_8021Q=m
-CONFIG_NET_DSA_TAG_AR9331=m
+# CONFIG_NET_DSA_TAG_AR9331 is not set
 CONFIG_NET_DSA_TAG_BRCM_COMMON=m
 CONFIG_NET_DSA_TAG_BRCM=m
 CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
@@ -1561,14 +1621,14 @@ CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
-# CONFIG_LLC2 is not set
+CONFIG_LLC2=m
 CONFIG_ATALK=m
 CONFIG_DEV_APPLETALK=m
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
 CONFIG_6LOWPAN=m
 # CONFIG_6LOWPAN_DEBUGFS is not set
 CONFIG_6LOWPAN_NHC=m
@@ -1586,7 +1646,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
 CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
 CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
 CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
 CONFIG_IEEE802154_SOCKET=m
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_MAC802154=m
@@ -1618,7 +1678,7 @@ CONFIG_NET_SCH_SKBPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_CAKE=m
 CONFIG_NET_SCH_FQ=m
 CONFIG_NET_SCH_HHF=m
@@ -1643,7 +1703,7 @@ CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
 CONFIG_NET_CLS_FLOWER=m
 CONFIG_NET_CLS_MATCHALL=m
@@ -1656,43 +1716,43 @@ CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
 CONFIG_NET_EMATCH_CANID=m
 CONFIG_NET_EMATCH_IPSET=m
-# CONFIG_NET_EMATCH_IPT is not set
+CONFIG_NET_EMATCH_IPT=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
+CONFIG_NET_ACT_SAMPLE=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
+CONFIG_NET_ACT_MPLS=m
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
+CONFIG_NET_ACT_CTINFO=m
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
+CONFIG_NET_ACT_CT=m
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_TC_SKB_EXT=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
-CONFIG_DNS_RESOLVER=y
+CONFIG_DNS_RESOLVER=m
 CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BATMAN_V=y
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_DEBUG=y
 CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
@@ -1708,15 +1768,16 @@ CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPLS_IPTUNNEL is not set
+CONFIG_MPLS_IPTUNNEL=m
 CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
-# CONFIG_QRTR_TUN is not set
-# CONFIG_NET_NCSI is not set
+CONFIG_QRTR_TUN=m
+CONFIG_NET_NCSI=y
+CONFIG_NCSI_OEM_CMD_GET_MAC=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -1754,6 +1815,7 @@ CONFIG_6PACK=m
 CONFIG_BPQETHER=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
 CONFIG_YAM=m
 # end of AX.25 network device drivers
 
@@ -1761,48 +1823,47 @@ CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
 CONFIG_CAN_GW=m
-# CONFIG_CAN_J1939 is not set
+CONFIG_CAN_J1939=m
 
 #
 # CAN Device Drivers
 #
 CONFIG_CAN_VCAN=m
-# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_VXCAN=m
 CONFIG_CAN_SLCAN=m
 CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_FLEXCAN is not set
+CONFIG_CAN_FLEXCAN=m
 # CONFIG_CAN_GRCAN is not set
-# CONFIG_CAN_KVASER_PCIEFD is not set
-# CONFIG_CAN_XILINXCAN is not set
+CONFIG_CAN_KVASER_PCIEFD=m
+CONFIG_CAN_XILINXCAN=m
 CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
+# CONFIG_CAN_C_CAN_PLATFORM is not set
 CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_CC770=m
-# CONFIG_CAN_CC770_ISA is not set
-CONFIG_CAN_CC770_PLATFORM=m
-# CONFIG_CAN_IFI_CANFD is not set
+# CONFIG_CAN_CC770 is not set
+CONFIG_CAN_IFI_CANFD=m
 CONFIG_CAN_M_CAN=m
-# CONFIG_CAN_M_CAN_PLATFORM is not set
-# CONFIG_CAN_M_CAN_TCAN4X5X is not set
-# CONFIG_CAN_PEAK_PCIEFD is not set
-# CONFIG_CAN_RCAR is not set
-# CONFIG_CAN_RCAR_CANFD is not set
+CONFIG_CAN_M_CAN_PLATFORM=m
+CONFIG_CAN_M_CAN_TCAN4X5X=m
+CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_SJA1000=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_F81601 is not set
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_F81601=m
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PEAK_PCI=m
 CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_PCMCIA=m
 CONFIG_CAN_PLX_PCI=m
 # CONFIG_CAN_SJA1000_ISA is not set
-CONFIG_CAN_SJA1000_PLATFORM=m
+# CONFIG_CAN_SJA1000_PLATFORM is not set
 CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
 
 #
 # CAN SPI interfaces
 #
-# CONFIG_CAN_HI311X is not set
+CONFIG_CAN_HI311X=m
 # CONFIG_CAN_MCP251X is not set
 # end of CAN SPI interfaces
 
@@ -1814,7 +1875,7 @@ CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
-# CONFIG_CAN_MCBA_USB is not set
+CONFIG_CAN_MCBA_USB=m
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
 # end of CAN USB interfaces
@@ -1833,7 +1894,7 @@ CONFIG_BT_HIDP=m
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_LEDS is not set
+CONFIG_BT_LEDS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BT_DEBUGFS is not set
 
@@ -1847,29 +1908,45 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
 CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
-# CONFIG_BT_HCIUART_AG6XX is not set
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
 CONFIG_BT_QCOMSMD=m
 CONFIG_BT_HCIRSI=m
 # end of Bluetooth device drivers
 
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=y
+CONFIG_AF_KCM=m
 CONFIG_STREAM_PARSER=y
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
@@ -1885,7 +1962,7 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
-CONFIG_CFG80211_DEBUGFS=y
+# CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_CFG80211_WEXT_EXPORT=y
@@ -1905,23 +1982,28 @@ CONFIG_MAC80211_DEBUGFS=y
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-# CONFIG_WIMAX is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_GPIO=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
 # CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
 CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_PRETTYDEBUG=y
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 CONFIG_NFC=m
 CONFIG_NFC_DIGITAL=m
 CONFIG_NFC_NCI=m
 # CONFIG_NFC_NCI_SPI is not set
-# CONFIG_NFC_NCI_UART is not set
+CONFIG_NFC_NCI_UART=m
 CONFIG_NFC_HCI=m
 CONFIG_NFC_SHDLC=y
 
@@ -1934,28 +2016,35 @@ CONFIG_NFC_PORT100=m
 # CONFIG_NFC_FDP is not set
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_I2C=m
-# CONFIG_NFC_PN533_USB is not set
-# CONFIG_NFC_PN533_I2C is not set
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_MICROREAD=m
 CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MRVL=m
 CONFIG_NFC_MRVL_USB=m
-# CONFIG_NFC_MRVL_I2C is not set
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
 CONFIG_NFC_ST21NFCA=m
 CONFIG_NFC_ST21NFCA_I2C=m
-# CONFIG_NFC_ST_NCI_I2C is not set
-# CONFIG_NFC_ST_NCI_SPI is not set
-# CONFIG_NFC_NXP_NCI is not set
-# CONFIG_NFC_S3FWRN5_I2C is not set
-# CONFIG_NFC_ST95HF is not set
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_ST95HF=m
 # end of Near Field Communication (NFC) devices
 
-# CONFIG_PSAMPLE is not set
+CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
+CONFIG_SOCK_VALIDATE_XMIT=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
@@ -1977,58 +2066,60 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=m
-CONFIG_PCIE_ECRC=y
+# CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
-# CONFIG_PCIE_DPC is not set
-# CONFIG_PCIE_PTM is not set
-CONFIG_PCIE_BW=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_BW is not set
+CONFIG_PCIE_EDR=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 CONFIG_PCI_STUB=y
-# CONFIG_PCI_PF_STUB is not set
+CONFIG_PCI_PF_STUB=m
 CONFIG_PCI_ATS=y
 CONFIG_PCI_ECAM=y
 CONFIG_PCI_BRIDGE_EMUL=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
+CONFIG_PCI_P2PDMA=y
 CONFIG_PCI_LABEL=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
 
 #
 # PCI controller drivers
 #
 CONFIG_PCI_AARDVARK=y
-# CONFIG_PCIE_XILINX_NWL is not set
-# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCIE_XILINX_NWL=y
+CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_TEGRA=y
-# CONFIG_PCIE_RCAR is not set
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_XILINX=y
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
-CONFIG_PCIE_IPROC=y
-CONFIG_PCIE_IPROC_PLATFORM=y
+CONFIG_PCIE_IPROC=m
+CONFIG_PCIE_IPROC_PLATFORM=m
 CONFIG_PCIE_IPROC_MSI=y
 CONFIG_PCIE_ALTERA=y
 CONFIG_PCIE_ALTERA_MSI=y
-# CONFIG_PCI_HOST_THUNDER_PEM is not set
-# CONFIG_PCI_HOST_THUNDER_ECAM is not set
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PCIE_ROCKCHIP_EP=y
 CONFIG_PCIE_MEDIATEK=y
 CONFIG_PCIE_BRCMSTB=m
 
@@ -2037,52 +2128,83 @@ CONFIG_PCIE_BRCMSTB=m
 #
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
-# CONFIG_PCIE_DW_PLAT_HOST is not set
+CONFIG_PCIE_DW_EP=y
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+CONFIG_PCIE_DW_PLAT_EP=y
 CONFIG_PCI_IMX6=y
-# CONFIG_PCI_LAYERSCAPE is not set
+CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCI_LAYERSCAPE_EP=y
 CONFIG_PCI_HISI=y
 CONFIG_PCIE_QCOM=y
-# CONFIG_PCIE_ARMADA_8K is not set
-# CONFIG_PCIE_KIRIN is not set
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_PCIE_KIRIN=y
 CONFIG_PCIE_HISI_STB=y
 CONFIG_PCI_MESON=y
-CONFIG_PCIE_UNIPHIER=y
-# CONFIG_PCIE_AL is not set
+CONFIG_PCIE_TEGRA194=m
+CONFIG_PCIE_TEGRA194_HOST=m
+CONFIG_PCIE_TEGRA194_EP=m
+CONFIG_PCIE_AL=y
 # end of DesignWare PCI Core Support
 
 #
 # Mobiveil PCIe Core Support
 #
-# CONFIG_PCIE_MOBIVEIL_PLAT is not set
-# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set
+CONFIG_PCIE_MOBIVEIL=y
+CONFIG_PCIE_MOBIVEIL_HOST=y
+CONFIG_PCIE_MOBIVEIL_PLAT=y
+CONFIG_PCIE_LAYERSCAPE_GEN4=y
 # end of Mobiveil PCIe Core Support
 
 #
 # Cadence PCIe controllers support
 #
-# CONFIG_PCIE_CADENCE_PLAT_HOST is not set
+CONFIG_PCIE_CADENCE=y
+CONFIG_PCIE_CADENCE_HOST=y
+CONFIG_PCIE_CADENCE_EP=y
+CONFIG_PCIE_CADENCE_PLAT=y
+CONFIG_PCIE_CADENCE_PLAT_HOST=y
+CONFIG_PCIE_CADENCE_PLAT_EP=y
 # end of Cadence PCIe controllers support
 # end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
-# CONFIG_PCI_ENDPOINT is not set
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+CONFIG_PCI_EPF_TEST=m
 # end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
-# CONFIG_PCI_SW_SWITCHTEC is not set
+CONFIG_PCI_SW_SWITCHTEC=m
 # end of PCI switch controller drivers
 
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
 CONFIG_RAPIDIO=m
 CONFIG_RAPIDIO_TSI721=m
 CONFIG_RAPIDIO_DISC_TIMEOUT=30
-CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
 CONFIG_RAPIDIO_DMA_ENGINE=y
-CONFIG_RAPIDIO_DEBUG=y
+# CONFIG_RAPIDIO_DEBUG is not set
 CONFIG_RAPIDIO_ENUM_BASIC=m
 CONFIG_RAPIDIO_CHMAN=m
 CONFIG_RAPIDIO_MPORT_CDEV=m
@@ -2090,29 +2212,32 @@ CONFIG_RAPIDIO_MPORT_CDEV=m
 #
 # RapidIO Switch drivers
 #
-# CONFIG_RAPIDIO_TSI57X is not set
-# CONFIG_RAPIDIO_CPS_XX is not set
-# CONFIG_RAPIDIO_TSI568 is not set
-# CONFIG_RAPIDIO_CPS_GEN2 is not set
-# CONFIG_RAPIDIO_RXS_GEN3 is not set
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
 # end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
+# CONFIG_STANDALONE is not set
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
 #
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
 CONFIG_FW_CACHE=y
 # end of Firmware loader
 
@@ -2120,19 +2245,23 @@ CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
-CONFIG_DEBUG_DEVRES=y
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+CONFIG_HMEM_REPORTING=y
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=m
-CONFIG_REGMAP_SPMI=y
+CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP_W1=m
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SOUNDWIRE=m
+CONFIG_REGMAP_SCCB=m
+CONFIG_REGMAP_I3C=m
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
@@ -2143,36 +2272,42 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 #
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI400_COMMON=y
-# CONFIG_BRCMSTB_GISB_ARB is not set
-# CONFIG_MOXTET is not set
-# CONFIG_HISILICON_LPC is not set
-# CONFIG_IMX_WEIM is not set
+CONFIG_BRCMSTB_GISB_ARB=y
+CONFIG_MOXTET=m
+CONFIG_HISILICON_LPC=y
+CONFIG_IMX_WEIM=y
 CONFIG_QCOM_EBI2=y
-# CONFIG_SIMPLE_PM_BUS is not set
+CONFIG_SIMPLE_PM_BUS=y
 CONFIG_SUN50I_DE2_BUS=y
-CONFIG_SUNXI_RSB=y
-# CONFIG_TEGRA_ACONNECT is not set
+CONFIG_SUNXI_RSB=m
+CONFIG_TEGRA_ACONNECT=y
 CONFIG_TEGRA_GMI=m
-CONFIG_UNIPHIER_SYSTEM_BUS=y
 CONFIG_VEXPRESS_CONFIG=y
-# CONFIG_FSL_MC_BUS is not set
+CONFIG_FSL_MC_BUS=y
 CONFIG_MHI_BUS=m
 # end of Bus devices
 
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
-CONFIG_MTD=y
-# CONFIG_MTD_TESTS is not set
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
 
 #
 # Partition parsers
 #
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
 CONFIG_MTD_OF_PARTS=m
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_AFS_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
 # end of Partition parsers
 
 #
@@ -2180,60 +2315,81 @@ CONFIG_MTD_OF_PARTS=m
 #
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
 # CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+CONFIG_MTD_PARTITIONED_MASTER=y
 
 #
 # RAM/ROM/Flash chip drivers
 #
 CONFIG_MTD_CFI=m
-# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_JEDECPROBE=m
 CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
 CONFIG_MTD_CFI_INTELEXT=m
 CONFIG_MTD_CFI_AMDSTD=m
 CONFIG_MTD_CFI_STAA=m
 CONFIG_MTD_CFI_UTIL=m
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
 # end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
 #
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_COMPLEX_MAPPINGS=y
 CONFIG_MTD_PHYSMAP=m
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP_OF is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_PLATRAM is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
+CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
 # end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
 #
-# CONFIG_MTD_PMC551 is not set
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
 # CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_MCHP23K256 is not set
+CONFIG_MTD_MCHP23K256=m
 # CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
 
 #
 # Disk-On-Chip Device Drivers
@@ -2242,7 +2398,11 @@ CONFIG_MTD_PHYSMAP=m
 # end of Self-contained MTD device drivers
 
 CONFIG_MTD_NAND_CORE=m
-# CONFIG_MTD_ONENAND is not set
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
 CONFIG_MTD_NAND_ECC_SW_HAMMING=m
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
 CONFIG_MTD_RAW_NAND=m
@@ -2252,11 +2412,12 @@ CONFIG_MTD_NAND_ECC_SW_BCH=y
 # Raw/parallel NAND flash controllers
 #
 CONFIG_MTD_NAND_DENALI=m
-CONFIG_MTD_NAND_DENALI_PCI=m
+# CONFIG_MTD_NAND_DENALI_PCI is not set
 CONFIG_MTD_NAND_DENALI_DT=m
 CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_MARVELL=m
-CONFIG_MTD_NAND_BRCMNAND=m
+# CONFIG_MTD_NAND_BRCMNAND is not set
+CONFIG_MTD_NAND_GPMI_NAND=m
 CONFIG_MTD_NAND_FSL_IFC=m
 CONFIG_MTD_NAND_MXC=m
 CONFIG_MTD_NAND_SUNXI=m
@@ -2280,16 +2441,17 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
 CONFIG_MTD_SPI_NAND=m
 
 #
 # LPDDR & LPDDR2 PCM memory drivers
 #
-# CONFIG_MTD_LPDDR is not set
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
 # end of LPDDR & LPDDR2 PCM memory drivers
 
-CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_CADENCE_QUADSPI=m
 CONFIG_SPI_HISI_SFC=m
@@ -2297,9 +2459,10 @@ CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_MTD_HYPERBUS is not set
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+CONFIG_HBMC_AM654=m
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -2314,7 +2477,11 @@ CONFIG_OF_MDIO=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
-# CONFIG_PARPORT is not set
+CONFIG_OF_NUMA=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
 CONFIG_PNP=y
 CONFIG_PNP_DEBUG_MESSAGES=y
 
@@ -2324,15 +2491,15 @@ CONFIG_PNP_DEBUG_MESSAGES=y
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_CDROM=y
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+CONFIG_CDROM=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
 CONFIG_ZRAM_WRITEBACK=y
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
@@ -2340,14 +2507,14 @@ CONFIG_BLK_DEV_SKD=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CDROM_PKTCDVD_WCACHE=y
 CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_RBD=m
-# CONFIG_BLK_DEV_RSXX is not set
+CONFIG_BLK_DEV_RSXX=m
 
 #
 # NVME Support
@@ -2357,41 +2524,49 @@ CONFIG_BLK_DEV_NVME=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_HWMON=y
 CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_TCP=m
-# CONFIG_NVME_TARGET is not set
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
 # end of NVME Support
 
 #
 # Misc devices
 #
 CONFIG_SENSORS_LIS3LV02D=m
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_PHANTOM is not set
-CONFIG_TIFM_CORE=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+CONFIG_DUMMY_IRQ=m
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
-# CONFIG_ICS932S401 is not set
+CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
-# CONFIG_HP_ILO is not set
+CONFIG_HP_ILO=m
 # CONFIG_QCOM_COINCELL is not set
 CONFIG_QCOM_FASTRPC=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
 CONFIG_ISL29020=m
 CONFIG_SENSORS_TSL2550=m
 CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
 CONFIG_VEXPRESS_SYSCFG=y
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
+CONFIG_PCI_ENDPOINT_TEST=m
+CONFIG_XILINX_SDFEC=m
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
-# CONFIG_C2PORT is not set
+CONFIG_C2PORT=m
 
 #
 # EEPROM support
@@ -2402,18 +2577,18 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
+CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
 # end of EEPROM support
 
-CONFIG_CB710_CORE=y
+CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 
 #
 # Texas Instruments shared transport line discipline
 #
-# CONFIG_TI_ST is not set
+CONFIG_TI_ST=m
 # end of Texas Instruments shared transport line discipline
 
 CONFIG_SENSORS_LIS3_I2C=m
@@ -2422,11 +2597,11 @@ CONFIG_ALTERA_STAPL=m
 #
 # Intel MIC & related support
 #
-CONFIG_VOP_BUS=m
-CONFIG_VOP=m
+# CONFIG_VOP_BUS is not set
 # end of Intel MIC & related support
 
-# CONFIG_GENWQE is not set
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 CONFIG_ECHO=m
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
@@ -2450,8 +2625,8 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_CONSTANTS=y
@@ -2474,26 +2649,38 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_SCSI_BNX2X_FCOE=m
 CONFIG_BE2ISCSI=m
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_HISI_SAS is not set
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=5000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_HISI_SAS=m
+CONFIG_SCSI_HISI_SAS_PCI=m
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_MVUMI=m
-# CONFIG_SCSI_ADVANSYS is not set
+CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ESAS2R=m
 CONFIG_MEGARAID_NEWGEN=y
@@ -2501,18 +2688,20 @@ CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_SMARTPQI is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_SMARTPQI=m
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
 CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_UFS_CDNS_PLATFORM=m
 # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
-CONFIG_SCSI_UFS_QCOM=m
+# CONFIG_SCSI_UFS_QCOM is not set
 CONFIG_SCSI_UFS_MEDIATEK=m
-# CONFIG_SCSI_UFS_HISI is not set
+CONFIG_SCSI_UFS_HISI=m
 CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_MYRB=m
@@ -2523,9 +2712,10 @@ CONFIG_FCOE=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_IPS is not set
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+# CONFIG_SCSI_GDTH is not set
+CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_STEX=m
@@ -2542,6 +2732,8 @@ CONFIG_SCSI_QLA_FC=m
 CONFIG_TCM_QLA2XXX=m
 # CONFIG_TCM_QLA2XXX_DEBUG is not set
 CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_DC395x=m
@@ -2549,10 +2741,15 @@ CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_PMCRAID=m
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_VIRTIO=y
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
 CONFIG_SCSI_DH=y
 CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
@@ -2575,20 +2772,20 @@ CONFIG_SATA_PMP=y
 #
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_MOBILE_LPM_POLICY=0
-CONFIG_SATA_AHCI_PLATFORM=y
-# CONFIG_AHCI_BRCM is not set
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_BRCM=m
 CONFIG_AHCI_IMX=m
-# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MTK=m
-CONFIG_AHCI_MVEBU=y
-CONFIG_AHCI_SUNXI=y
-# CONFIG_AHCI_TEGRA is not set
-CONFIG_AHCI_XGENE=y
-# CONFIG_AHCI_QORIQ is not set
-CONFIG_SATA_AHCI_SEATTLE=y
+CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=m
+CONFIG_AHCI_TEGRA=m
+CONFIG_AHCI_XGENE=m
+CONFIG_AHCI_QORIQ=m
+CONFIG_SATA_AHCI_SEATTLE=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=y
+CONFIG_SATA_SIL24=m
 CONFIG_ATA_SFF=y
 
 #
@@ -2602,12 +2799,13 @@ CONFIG_ATA_BMDMA=y
 #
 # SATA SFF controllers with BMDMA
 #
-CONFIG_ATA_PIIX=y
-# CONFIG_SATA_DWC is not set
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_DWC=m
+CONFIG_SATA_DWC_OLD_DMA=y
+# CONFIG_SATA_DWC_DEBUG is not set
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PROMISE=m
-# CONFIG_SATA_RCAR is not set
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIS=m
 CONFIG_SATA_SVW=m
@@ -2643,7 +2841,7 @@ CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_PDC_OLD=m
-# CONFIG_PATA_RADISYS is not set
+CONFIG_PATA_RADISYS=m
 CONFIG_PATA_RDC=m
 CONFIG_PATA_SCH=m
 CONFIG_PATA_SERVERWORKS=m
@@ -2661,9 +2859,10 @@ CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_MPIIX=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_PLATFORM=y
-CONFIG_PATA_OF_PLATFORM=y
-# CONFIG_PATA_RZ1000 is not set
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PLATFORM=m
+# CONFIG_PATA_OF_PLATFORM is not set
+CONFIG_PATA_RZ1000=m
 
 #
 # Generic fallback / legacy drivers
@@ -2672,8 +2871,7 @@ CONFIG_PATA_OF_PLATFORM=y
 CONFIG_ATA_GENERIC=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
+CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
@@ -2681,36 +2879,35 @@ CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
+CONFIG_MD_CLUSTER=m
 CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_DM_DEBUG=y
-CONFIG_DM_BUFIO=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
 # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_UNSTRIPED is not set
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
-# CONFIG_DM_WRITECACHE is not set
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=y
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
+CONFIG_DM_MIRROR=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=y
+CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_DUST=m
-CONFIG_DM_INIT=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2728,12 +2925,24 @@ CONFIG_TCM_USER2=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
-# CONFIG_FUSION is not set
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
 # end of IEEE 1394 (FireWire) support
 
@@ -2757,16 +2966,17 @@ CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_IPVLAN_L3S=y
 CONFIG_IPVLAN=m
-# CONFIG_IPVTAP is not set
+CONFIG_IPVTAP=m
 CONFIG_VXLAN=m
 CONFIG_GENEVE=m
 CONFIG_BAREUDP=m
-# CONFIG_GTP is not set
-# CONFIG_MACSEC is not set
+CONFIG_GTP=m
+CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
 CONFIG_RIONET=m
 CONFIG_RIONET_TX_SIZE=128
 CONFIG_RIONET_RX_SIZE=128
@@ -2777,23 +2987,55 @@ CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
 CONFIG_NLMON=m
 CONFIG_NET_VRF=m
-# CONFIG_VSOCKMON is not set
+CONFIG_VSOCKMON=m
+CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
-# CONFIG_ATM_DRIVERS is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+CONFIG_ATM_ENI_TUNE_BURST=y
+CONFIG_ATM_ENI_BURST_TX_16W=y
+CONFIG_ATM_ENI_BURST_TX_8W=y
+CONFIG_ATM_ENI_BURST_TX_4W=y
+CONFIG_ATM_ENI_BURST_TX_2W=y
+CONFIG_ATM_ENI_BURST_RX_16W=y
+CONFIG_ATM_ENI_BURST_RX_8W=y
+CONFIG_ATM_ENI_BURST_RX_4W=y
+CONFIG_ATM_ENI_BURST_RX_2W=y
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+# CONFIG_CAIF_DRIVERS is not set
 
 #
 # Distributed Switch Architecture drivers
 #
 CONFIG_B53=m
-# CONFIG_B53_SPI_DRIVER is not set
-# CONFIG_B53_MDIO_DRIVER is not set
-# CONFIG_B53_MMAP_DRIVER is not set
-# CONFIG_B53_SRAB_DRIVER is not set
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
 CONFIG_B53_SERDES=m
 CONFIG_NET_DSA_BCM_SF2=m
-# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA_LANTIQ_GSWIP=m
-# CONFIG_NET_DSA_MT7530 is not set
+CONFIG_NET_DSA_MT7530=m
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -2803,23 +3045,31 @@ CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
 CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
 CONFIG_NET_DSA_MSCC_FELIX=m
-CONFIG_NET_DSA_AR9331=m
+# CONFIG_NET_DSA_AR9331 is not set
 CONFIG_NET_DSA_SJA1105=m
-# CONFIG_NET_DSA_SJA1105_PTP is not set
+CONFIG_NET_DSA_SJA1105_PTP=y
+CONFIG_NET_DSA_SJA1105_TAS=y
 CONFIG_NET_DSA_QCA8K=m
-# CONFIG_NET_DSA_REALTEK_SMI is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+CONFIG_NET_DSA_REALTEK_SMI=m
+CONFIG_NET_DSA_SMSC_LAN9303=m
+CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
+CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
 # end of Distributed Switch Architecture drivers
 
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
 CONFIG_NET_VENDOR_ALACRITECH=y
@@ -2829,12 +3079,13 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
+# CONFIG_ALTERA_TSE is not set
 CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_ENA_ETHERNET=m
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
 CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_DCB=y
 CONFIG_NET_XGENE=y
@@ -2842,15 +3093,15 @@ CONFIG_NET_XGENE_V2=y
 CONFIG_NET_VENDOR_AQUANTIA=y
 CONFIG_AQTION=m
 CONFIG_NET_VENDOR_ARC=y
-CONFIG_ARC_EMAC_CORE=m
-CONFIG_EMAC_ROCKCHIP=m
+# CONFIG_EMAC_ROCKCHIP is not set
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
-# CONFIG_NET_VENDOR_AURORA is not set
+CONFIG_NET_VENDOR_AURORA=y
+CONFIG_AURORA_NB8800=m
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2863,47 +3114,92 @@ CONFIG_TIGON3=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
-CONFIG_BGMAC=y
-CONFIG_BGMAC_PLATFORM=y
-# CONFIG_SYSTEMPORT is not set
-# CONFIG_BNXT is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
+CONFIG_BGMAC=m
+CONFIG_BGMAC_PLATFORM=m
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_DCB=y
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MACB_PCI=m
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
 CONFIG_NET_VENDOR_CORTINA=y
-# CONFIG_GEMINI_ETHERNET is not set
+CONFIG_GEMINI_ETHERNET=m
 CONFIG_DNET=m
-# CONFIG_NET_VENDOR_DEC is not set
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_DL2K=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC=m
-# CONFIG_FSL_FMAN is not set
+CONFIG_FSL_FMAN=m
 CONFIG_DPAA_ERRATUM_A050385=y
-# CONFIG_FSL_PQ_MDIO is not set
-# CONFIG_FSL_XGMAC_MDIO is not set
-# CONFIG_GIANFAR is not set
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_FSL_XGMAC_MDIO=m
+CONFIG_GIANFAR=m
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
 CONFIG_FSL_ENETC=m
 CONFIG_FSL_ENETC_VF=m
 CONFIG_FSL_ENETC_MDIO=m
 CONFIG_FSL_ENETC_PTP_CLOCK=m
-# CONFIG_FSL_ENETC_QOS is not set
+CONFIG_FSL_ENETC_QOS=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
+CONFIG_GVE=m
 CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_HIX5HD2_GMAC=m
-# CONFIG_HISI_FEMAC is not set
+CONFIG_HISI_FEMAC=m
 CONFIG_HIP04_ETH=m
-# CONFIG_HI13X1_GMAC is not set
+CONFIG_HI13X1_GMAC=y
 CONFIG_HNS_MDIO=m
 CONFIG_HNS=m
 CONFIG_HNS_DSAF=m
@@ -2911,11 +3207,11 @@ CONFIG_HNS_ENET=m
 CONFIG_HNS3=m
 CONFIG_HNS3_HCLGE=m
 CONFIG_HNS3_DCB=y
-# CONFIG_HNS3_HCLGEVF is not set
+CONFIG_HNS3_HCLGEVF=m
 CONFIG_HNS3_ENET=m
 CONFIG_NET_VENDOR_HUAWEI=y
-# CONFIG_HINIC is not set
-# CONFIG_NET_VENDOR_I825XX is not set
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E100=m
 CONFIG_E1000=m
@@ -2927,19 +3223,21 @@ CONFIG_IXGB=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
 CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
 CONFIG_I40E=m
-# CONFIG_I40E_DCB is not set
+CONFIG_I40E_DCB=y
 CONFIG_IAVF=m
 CONFIG_I40EVF=m
-# CONFIG_ICE is not set
+CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
 CONFIG_MVNETA=m
-# CONFIG_MVPP2 is not set
+CONFIG_MVPP2=m
 # CONFIG_PXA168_ETH is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -2959,18 +3257,44 @@ CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
 CONFIG_MLX4_CORE_GEN2=y
-# CONFIG_MLX5_CORE is not set
-# CONFIG_MLXSW_CORE is not set
-# CONFIG_MLXFW is not set
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+CONFIG_MLX5_FPGA=y
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_TC_CT=y
+CONFIG_MLX5_CORE_EN_DCB=y
+CONFIG_MLX5_CORE_IPOIB=y
+CONFIG_MLX5_FPGA_IPSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_FPGA_TLS=y
+CONFIG_MLX5_TLS=y
+CONFIG_MLX5_EN_TLS=y
+CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SWITCHIB=m
+CONFIG_MLXSW_SWITCHX2=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
 CONFIG_NET_VENDOR_MICREL=y
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
 CONFIG_KSZ884X_PCI=m
 CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCX24J600 is not set
-# CONFIG_LAN743X is not set
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH=m
 CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m
@@ -2981,14 +3305,20 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETERION=y
-# CONFIG_S2IO is not set
-# CONFIG_VXGE is not set
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_NET_VENDOR_NETRONOME=y
-# CONFIG_NFP is not set
+CONFIG_NFP=m
+CONFIG_NFP_APP_FLOWER=y
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
 CONFIG_NET_VENDOR_NI=y
 CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
@@ -2998,8 +3328,27 @@ CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_NET_VENDOR_PENSANDO=y
 CONFIG_IONIC=m
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCA7000=m
+CONFIG_QCA7000_SPI=m
+CONFIG_QCA7000_UART=m
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_REALTEK=y
@@ -3010,13 +3359,18 @@ CONFIG_8139TOO=m
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
-# CONFIG_NET_VENDOR_RENESAS is not set
+CONFIG_NET_VENDOR_RENESAS=y
 CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_ROCKER=m
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
 CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 CONFIG_NET_VENDOR_SILAN=y
@@ -3026,28 +3380,32 @@ CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
+CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
-# CONFIG_SNI_AVE is not set
-# CONFIG_SNI_NETSEC is not set
+CONFIG_SNI_NETSEC=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
-# CONFIG_DWMAC_DWC_QOS_ETH is not set
+CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MEDIATEK=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_QCOM_ETHQOS=m
 CONFIG_DWMAC_ROCKCHIP=m
-# CONFIG_DWMAC_SOCFPGA is not set
+CONFIG_DWMAC_SOCFPGA=m
 CONFIG_DWMAC_SUNXI=m
 CONFIG_DWMAC_SUN8I=m
-# CONFIG_STMMAC_PCI is not set
-# CONFIG_NET_VENDOR_SUN is not set
+CONFIG_STMMAC_PCI=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
 CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_DWC_XLGMAC=m
 CONFIG_DWC_XLGMAC_PCI=m
@@ -3055,36 +3413,53 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-# CONFIG_TLAN is not set
+CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_VELOCITY=m
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_XILINX is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_AXI_EMAC=m
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=m
+CONFIG_DEFXX=m
+CONFIG_DEFXX_MMIO=y
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
 CONFIG_QCOM_IPA=m
-CONFIG_NET_SB1000=y
+# CONFIG_NET_SB1000 is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_BUS=y
 # CONFIG_MDIO_BCM_IPROC is not set
 CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_BUS_MUX=y
-CONFIG_MDIO_BUS_MUX_BCM_IPROC=y
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_BCM_IPROC=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MESON_G12A=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=y
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
-# CONFIG_MDIO_GPIO is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
 CONFIG_MDIO_IPQ8064=m
-# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_MSCC_MIIM=m
 CONFIG_MDIO_MVUSB=m
-# CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_SUN4I is not set
-# CONFIG_MDIO_THUNDER is not set
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_SUN4I=m
+CONFIG_MDIO_THUNDER=m
 CONFIG_MDIO_XGENE=y
 CONFIG_MDIO_XPCS=m
 CONFIG_PHYLINK=m
@@ -3095,8 +3470,8 @@ CONFIG_LED_TRIGGER_PHY=y
 #
 # MII PHY device drivers
 #
-# CONFIG_SFP is not set
-# CONFIG_ADIN_PHY is not set
+CONFIG_SFP=m
+CONFIG_ADIN_PHY=m
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AX88796B_PHY=m
@@ -3104,15 +3479,15 @@ CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
 CONFIG_BCM_NET_PHYLIB=m
 CONFIG_BROADCOM_PHY=m
-# CONFIG_BCM84881_PHY is not set
+CONFIG_BCM84881_PHY=y
 CONFIG_CICADA_PHY=m
 CONFIG_CORTINA_PHY=m
 CONFIG_DAVICOM_PHY=m
 CONFIG_DP83822_PHY=m
-# CONFIG_DP83TC811_PHY is not set
+CONFIG_DP83TC811_PHY=m
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
-# CONFIG_DP83869_PHY is not set
+CONFIG_DP83869_PHY=m
 CONFIG_FIXED_PHY=y
 CONFIG_ICPLUS_PHY=m
 CONFIG_INTEL_XWAY_PHY=m
@@ -3120,13 +3495,13 @@ CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
-CONFIG_MESON_GXL_PHY=y
+CONFIG_MESON_GXL_PHY=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
-# CONFIG_MICROCHIP_T1_PHY is not set
+CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
-# CONFIG_NXP_TJA11XX_PHY is not set
+CONFIG_NXP_TJA11XX_PHY=m
 CONFIG_AT803X_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
@@ -3137,7 +3512,8 @@ CONFIG_STE10XP=m
 CONFIG_TERANETICS_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_MICREL_KS8995MA is not set
+CONFIG_MICREL_KS8995MA=m
+CONFIG_PLIP=m
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
@@ -3154,8 +3530,12 @@ CONFIG_SLIP=m
 CONFIG_SLHC=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_USB_NET_DRIVERS=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
@@ -3194,76 +3574,74 @@ CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_NET_QMI_WWAN=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_USB_NET_AQC111=m
 CONFIG_WLAN=y
-CONFIG_WIRELESS_WDS=y
+# CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
 CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
-CONFIG_ATH5K_DEBUG=y
+# CONFIG_ATH5K_DEBUG is not set
 # CONFIG_ATH5K_TRACER is not set
 CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_COMMON_DEBUG=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_DEBUGFS=y
-# CONFIG_ATH9K_STATION_STATISTICS is not set
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
 # CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
+CONFIG_ATH9K_WOW=y
 CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
 CONFIG_ATH9K_PCOEM=y
 CONFIG_ATH9K_PCI_NO_EEPROM=m
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_ATH9K_HWRNG=y
-# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 # CONFIG_CARL9170_DEBUGFS is not set
 CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
+CONFIG_CARL9170_HWRNG=y
 CONFIG_ATH6KL=m
 CONFIG_ATH6KL_SDIO=m
 CONFIG_ATH6KL_USB=m
-CONFIG_ATH6KL_DEBUG=y
+# CONFIG_ATH6KL_DEBUG is not set
 # CONFIG_ATH6KL_TRACING is not set
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_WIL6210_DEBUGFS=y
+CONFIG_WIL6210_TRACING=y
+# CONFIG_WIL6210_DEBUGFS is not set
 CONFIG_ATH10K=m
 CONFIG_ATH10K_CE=y
 CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_AHB is not set
-# CONFIG_ATH10K_SDIO is not set
+CONFIG_ATH10K_AHB=y
+CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH10K_SNOC is not set
+CONFIG_ATH10K_SNOC=m
 # CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_SPECTRAL is not set
+# CONFIG_ATH10K_DEBUGFS is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_ATH11K=m
 # CONFIG_ATH11K_DEBUG is not set
-# CONFIG_ATH11K_DEBUGFS is not set
+CONFIG_ATH11K_DEBUGFS=y
 # CONFIG_ATH11K_TRACING is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
 CONFIG_AT76C50X_USB=m
 CONFIG_WLAN_VENDOR_BROADCOM=y
 CONFIG_B43=m
@@ -3283,13 +3661,13 @@ CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_HT=y
 CONFIG_B43_LEDS=y
 CONFIG_B43_HWRNG=y
-CONFIG_B43_DEBUG=y
+# CONFIG_B43_DEBUG is not set
 CONFIG_B43LEGACY=m
 CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 CONFIG_B43LEGACY_LEDS=y
 CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -3306,18 +3684,19 @@ CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
 CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO_CS=m
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_DEBUG=y
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
+CONFIG_IPW2200_DEBUG=y
 CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_LIBIPW_DEBUG=y
 CONFIG_IWLEGACY=m
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
@@ -3325,8 +3704,8 @@ CONFIG_IWL3945=m
 #
 # iwl3945 / iwl4965 Debugging Options
 #
-CONFIG_IWLEGACY_DEBUG=y
-CONFIG_IWLEGACY_DEBUGFS=y
+# CONFIG_IWLEGACY_DEBUG is not set
+# CONFIG_IWLEGACY_DEBUGFS is not set
 # end of iwl3945 / iwl4965 Debugging Options
 
 CONFIG_IWLWIFI=m
@@ -3347,9 +3726,10 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
 CONFIG_HERMES=m
 CONFIG_HERMES_PRISM=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
@@ -3357,6 +3737,8 @@ CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_NORTEL_HERMES=m
 CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
@@ -3367,6 +3749,7 @@ CONFIG_PRISM54=m
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 # CONFIG_LIBERTAS_SPI is not set
 # CONFIG_LIBERTAS_DEBUG is not set
@@ -3390,7 +3773,7 @@ CONFIG_MT76x0_COMMON=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x2_COMMON=m
-# CONFIG_MT76x2E is not set
+CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
 CONFIG_MT7615E=m
@@ -3423,7 +3806,7 @@ CONFIG_RT2X00_LIB=m
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB_DEBUGFS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_RTL8180=m
@@ -3447,7 +3830,7 @@ CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
-# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTW88=m
 CONFIG_RTW88_CORE=m
 CONFIG_RTW88_PCI=m
@@ -3457,7 +3840,7 @@ CONFIG_RTW88_8822CE=y
 # CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
 CONFIG_RSI_COEX=y
@@ -3467,14 +3850,14 @@ CONFIG_CW1200_WLAN_SDIO=m
 # CONFIG_CW1200_WLAN_SPI is not set
 CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
+# CONFIG_WL1251_SPI is not set
 CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE=m
-CONFIG_WLCORE_SPI=m
+# CONFIG_WLCORE_SPI is not set
 CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
+# CONFIG_WILINK_PLATFORM_DATA is not set
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
@@ -3482,27 +3865,35 @@ CONFIG_ZD1211RW=m
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_QTNFMAC=m
 CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
 CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_VIRT_WIFI=m
 
 #
-# Enable WiMAX (Networking options) to see the WiMAX drivers
+# WiMAX Wireless Broadband devices
 #
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
 # CONFIG_IEEE802154_AT86RF230 is not set
 # CONFIG_IEEE802154_MRF24J40 is not set
 # CONFIG_IEEE802154_CC2520 is not set
-CONFIG_IEEE802154_ATUSB=m
-# CONFIG_IEEE802154_ADF7242 is not set
+# CONFIG_IEEE802154_ATUSB is not set
+CONFIG_IEEE802154_ADF7242=m
 CONFIG_IEEE802154_CA8210=m
-# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
-# CONFIG_IEEE802154_MCR20A is not set
+CONFIG_IEEE802154_CA8210_DEBUGFS=y
+CONFIG_IEEE802154_MCR20A=m
 CONFIG_IEEE802154_HWSIM=m
+CONFIG_VMXNET3=m
 # CONFIG_FUJITSU_ES is not set
-# CONFIG_NETDEVSIM is not set
+CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set
@@ -3515,13 +3906,13 @@ CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=y
+CONFIG_INPUT_MATRIXKMAP=m
 
 #
 # Userland interfaces
 #
 CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
@@ -3533,40 +3924,40 @@ CONFIG_INPUT_EVDEV=y
 #
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_QT1050=m
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
 CONFIG_KEYBOARD_SNVS_PWRKEY=m
 CONFIG_KEYBOARD_IMX=m
 CONFIG_KEYBOARD_IMX_SC_KEY=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_TEGRA is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_KEYBOARD_OPENCORES=m
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_SUN4I_LRADC is not set
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_SUN4I_LRADC=m
 CONFIG_KEYBOARD_IQS62X=m
 # CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_CROS_EC=y
-# CONFIG_KEYBOARD_CAP11XX is not set
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_KEYBOARD_CAP11XX=m
 # CONFIG_KEYBOARD_BCM is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
@@ -3580,7 +3971,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
 CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_TOUCHKIT=y
 CONFIG_MOUSE_PS2_FOCALTECH=y
 CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_MOUSE_SERIAL=m
@@ -3591,7 +3982,7 @@ CONFIG_MOUSE_ELAN_I2C=m
 CONFIG_MOUSE_ELAN_I2C_I2C=y
 CONFIG_MOUSE_ELAN_I2C_SMBUS=y
 CONFIG_MOUSE_VSXXXAA=m
-# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_GPIO=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_INPUT_JOYSTICK=y
@@ -3616,13 +4007,18 @@ CONFIG_JOYSTICK_SPACEBALL=m
 CONFIG_JOYSTICK_STINGER=m
 CONFIG_JOYSTICK_TWIDJOY=m
 CONFIG_JOYSTICK_ZHENHUA=m
-# CONFIG_JOYSTICK_AS5011 is not set
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_JOYSTICK_PSXPAD_SPI=m
+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
+CONFIG_JOYSTICK_PXRC=m
 CONFIG_JOYSTICK_FSIA6B=m
 CONFIG_INPUT_TABLET=y
 CONFIG_TABLET_USB_ACECAD=m
@@ -3634,43 +4030,49 @@ CONFIG_TABLET_USB_PEGASUS=m
 CONFIG_TABLET_SERIAL_WACOM4=m
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_PROPERTIES=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
+CONFIG_TOUCHSCREEN_ADS7846=m
 # CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 CONFIG_TOUCHSCREEN_ADC=m
-# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
+CONFIG_TOUCHSCREEN_AR1021_I2C=m
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT_T37=y
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-# CONFIG_TOUCHSCREEN_BU21013 is not set
+CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_BU21029=m
-# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
-# CONFIG_TOUCHSCREEN_CHIPONE_ICN8505 is not set
-# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP4_SPI is not set
 CONFIG_TOUCHSCREEN_DYNAPRO=m
-# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
-# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
 CONFIG_TOUCHSCREEN_EXC3000=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
-# CONFIG_TOUCHSCREEN_GOODIX is not set
+CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_HIDEEP=m
 CONFIG_TOUCHSCREEN_ILI210X=m
-# CONFIG_TOUCHSCREEN_IPROC is not set
+CONFIG_TOUCHSCREEN_IPROC=m
 CONFIG_TOUCHSCREEN_S6SY761=m
 CONFIG_TOUCHSCREEN_GUNZE=m
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
+CONFIG_TOUCHSCREEN_EKTF2127=m
 CONFIG_TOUCHSCREEN_ELAN=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WACOM_I2C=m
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
+CONFIG_TOUCHSCREEN_MAX11801=m
 CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MMS114=m
-# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
+CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
 CONFIG_TOUCHSCREEN_INEXIO=m
@@ -3680,9 +4082,13 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
+# CONFIG_TOUCHSCREEN_TI_AM335X_TSC is not set
 CONFIG_TOUCHSCREEN_PIXCIR=m
-# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
-# CONFIG_TOUCHSCREEN_WM97XX is not set
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -3704,93 +4110,100 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
-# CONFIG_TOUCHSCREEN_TSC2004 is not set
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
-# CONFIG_TOUCHSCREEN_RM_TS is not set
-# CONFIG_TOUCHSCREEN_SILEAD is not set
-# CONFIG_TOUCHSCREEN_SIS_I2C is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
-# CONFIG_TOUCHSCREEN_STMFTS is not set
-# CONFIG_TOUCHSCREEN_SUN4I is not set
-# CONFIG_TOUCHSCREEN_SUR40 is not set
+CONFIG_TOUCHSCREEN_STMFTS=m
+CONFIG_TOUCHSCREEN_SUN4I=m
+CONFIG_TOUCHSCREEN_SUR40=m
 # CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
-# CONFIG_TOUCHSCREEN_SX8654 is not set
-# CONFIG_TOUCHSCREEN_TPS6507X is not set
-# CONFIG_TOUCHSCREEN_ZET6223 is not set
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
-# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
-# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_AD714X is not set
-# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BMA150 is not set
-CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+# CONFIG_INPUT_AD714X_SPI is not set
+CONFIG_INPUT_ATMEL_CAPTOUCH=m
+CONFIG_INPUT_BMA150=m
+# CONFIG_INPUT_E3X0_BUTTON is not set
 CONFIG_INPUT_MSM_VIBRATOR=m
-CONFIG_INPUT_PM8941_PWRKEY=y
-# CONFIG_INPUT_PM8XXX_VIBRATOR is not set
+CONFIG_INPUT_PM8941_PWRKEY=m
+CONFIG_INPUT_PM8XXX_VIBRATOR=m
 CONFIG_INPUT_MAX77650_ONKEY=m
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
-# CONFIG_INPUT_GPIO_DECODER is not set
+CONFIG_INPUT_GPIO_DECODER=m
 CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_CPCAP_PWRBUTTON=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_KXTJ9=m
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
-# CONFIG_INPUT_REGULATOR_HAPTIC is not set
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_UINPUT=m
-# CONFIG_INPUT_PCF8574 is not set
+CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_PWM_VIBRA=m
-# CONFIG_INPUT_RK805_PWRKEY is not set
+CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-# CONFIG_INPUT_ADXL34X is not set
-# CONFIG_INPUT_IMS_PCU is not set
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-# CONFIG_INPUT_DRV260X_HAPTICS is not set
-# CONFIG_INPUT_DRV2665_HAPTICS is not set
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-CONFIG_INPUT_HISI_POWERKEY=y
-# CONFIG_INPUT_SC27XX_VIBRA is not set
-# CONFIG_INPUT_STPMIC1_ONKEY is not set
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_HISI_POWERKEY=m
+CONFIG_INPUT_SC27XX_VIBRA=m
+CONFIG_INPUT_STPMIC1_ONKEY=m
 CONFIG_RMI4_CORE=m
-# CONFIG_RMI4_I2C is not set
-# CONFIG_RMI4_SPI is not set
-# CONFIG_RMI4_SMB is not set
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
 CONFIG_RMI4_F03=y
 CONFIG_RMI4_F03_SERIO=m
 CONFIG_RMI4_2D_SENSOR=y
 CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_F55 is not set
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F54=y
+CONFIG_RMI4_F55=y
 
 #
 # Hardware I/O ports
 #
 CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_AMBAKMI=y
-# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_PARKBD=m
+# CONFIG_SERIO_AMBAKMI is not set
+CONFIG_SERIO_PCIPS2=m
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
-# CONFIG_SERIO_PS2MULT is not set
-CONFIG_SERIO_ARC_PS2=m
-# CONFIG_SERIO_APBPS2 is not set
+CONFIG_SERIO_PS2MULT=m
+# CONFIG_SERIO_ARC_PS2 is not set
+CONFIG_SERIO_APBPS2=m
 # CONFIG_SERIO_SUN4I_PS2 is not set
 CONFIG_SERIO_GPIO_PS2=m
-# CONFIG_USERIO is not set
+CONFIG_USERIO=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -3810,7 +4223,8 @@ CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=0
 CONFIG_LDISC_AUTOLOAD=y
 
 #
@@ -3826,31 +4240,32 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
 # CONFIG_SERIAL_8250_ASPEED_VUART is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
+# CONFIG_SERIAL_8250_RSA is not set
 CONFIG_SERIAL_8250_DWLIB=y
 CONFIG_SERIAL_8250_BCM2835AUX=y
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_MT6577 is not set
-# CONFIG_SERIAL_8250_UNIPHIER is not set
-CONFIG_SERIAL_8250_TEGRA=m
+CONFIG_SERIAL_8250_MT6577=y
+CONFIG_SERIAL_8250_TEGRA=y
 CONFIG_SERIAL_OF_PLATFORM=y
 
 #
 # Non-8250 serial port support
 #
-# CONFIG_SERIAL_AMBA_PL010 is not set
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
+# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
 # CONFIG_SERIAL_KGDB_NMI is not set
 CONFIG_SERIAL_MESON=y
 CONFIG_SERIAL_MESON_CONSOLE=y
@@ -3858,37 +4273,45 @@ CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 CONFIG_SERIAL_SAMSUNG_UARTS=4
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_TEGRA_TCU=m
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_IMX=m
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
 # CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIAL_SH_SCI is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_CONSOLE_POLL=y
 CONFIG_SERIAL_JSM=m
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SERIAL_SIFIVE=m
+CONFIG_SERIAL_QCOM_GENI=y
+CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
+# CONFIG_SERIAL_SIFIVE is not set
+# CONFIG_SERIAL_QE is not set
 # CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
+CONFIG_SERIAL_SC16IS7XX_CORE=m
+CONFIG_SERIAL_SC16IS7XX=m
+CONFIG_SERIAL_SC16IS7XX_I2C=y
+CONFIG_SERIAL_SC16IS7XX_SPI=y
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-CONFIG_SERIAL_FSL_LINFLEXUART=m
+# CONFIG_SERIAL_ARC is not set
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_FSL_LINFLEXUART=y
+CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# CONFIG_SERIAL_SPRD is not set
+CONFIG_SERIAL_SPRD=y
+CONFIG_SERIAL_SPRD_CONSOLE=y
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_MVEBU_CONSOLE=y
-# CONFIG_SERIAL_OWL is not set
+CONFIG_SERIAL_OWL=y
+CONFIG_SERIAL_OWL_CONSOLE=y
 # end of Serial drivers
 
 CONFIG_SERIAL_MCTRL_GPIO=y
@@ -3896,67 +4319,88 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_ROCKETPORT=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
 CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m
-# CONFIG_ISI is not set
+CONFIG_ISI=m
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_NOZOMI=m
 CONFIG_NULL_TTY=m
-# CONFIG_TRACE_SINK is not set
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
 CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
-# CONFIG_SERIAL_DEV_BUS is not set
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 # CONFIG_TTY_PRINTK is not set
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
 CONFIG_VIRTIO_CONSOLE=y
-CONFIG_IPMI_HANDLER=y
+CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_DMI_DECODE=y
 CONFIG_IPMI_PLAT_DATA=y
-# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_PANIC_EVENT=y
+# CONFIG_IPMI_PANIC_STRING is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMB_DEVICE_INTERFACE is not set
+CONFIG_IPMB_DEVICE_INTERFACE=m
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_BCM2835=y
-CONFIG_HW_RANDOM_IPROC_RNG200=y
+CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_IPROC_RNG200=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_HISI=y
-CONFIG_HW_RANDOM_HISI_V2=y
+CONFIG_HW_RANDOM_HISI=m
+CONFIG_HW_RANDOM_HISI_V2=m
 CONFIG_HW_RANDOM_XGENE=m
-CONFIG_HW_RANDOM_MESON=y
-CONFIG_HW_RANDOM_CAVIUM=y
-CONFIG_HW_RANDOM_MTK=y
-CONFIG_HW_RANDOM_EXYNOS=y
-# CONFIG_APPLICOM is not set
+CONFIG_HW_RANDOM_MESON=m
+CONFIG_HW_RANDOM_CAVIUM=m
+CONFIG_HW_RANDOM_MTK=m
+CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_SCR24X=m
+CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
 CONFIG_DEVMEM=y
-CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=8192
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=4096
 CONFIG_DEVPORT=y
-CONFIG_TCG_TPM=m
+CONFIG_TCG_TPM=y
 CONFIG_HW_RANDOM_TPM=y
-CONFIG_TCG_TIS_CORE=m
-CONFIG_TCG_TIS=m
-# CONFIG_TCG_TIS_SPI is not set
-# CONFIG_TCG_TIS_I2C_ATMEL is not set
-# CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C_NUVOTON is not set
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_SPI_CR50=y
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
 CONFIG_TCG_ATMEL=m
-# CONFIG_TCG_INFINEON is not set
-# CONFIG_TCG_CRB is not set
-# CONFIG_TCG_VTPM_PROXY is not set
-# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
-# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
-# CONFIG_XILLYBUS is not set
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_CRB=y
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
+CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
 
 #
@@ -3965,20 +4409,20 @@ CONFIG_TCG_ATMEL=m
 CONFIG_I2C=y
 CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
+# CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=m
 
 #
 # Multiplexer I2C Chip support
 #
-CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
 CONFIG_I2C_MUX_GPIO=m
-# CONFIG_I2C_MUX_GPMUX is not set
-# CONFIG_I2C_MUX_LTC4306 is not set
+CONFIG_I2C_MUX_GPMUX=m
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_PINCTRL=m
+# CONFIG_I2C_MUX_PINCTRL is not set
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
@@ -3996,88 +4440,87 @@ CONFIG_I2C_ALGOPCA=m
 #
 # PC SMBus host controller drivers
 #
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-CONFIG_I2C_AMD_MP2=m
-# CONFIG_I2C_HIX5HD2 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
+# CONFIG_I2C_AMD_MP2 is not set
+CONFIG_I2C_HIX5HD2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
 CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_NVIDIA_GPU=m
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
 # CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
+CONFIG_I2C_VIAPRO=m
 
 #
 # ACPI drivers
 #
-CONFIG_I2C_SCMI=y
+# CONFIG_I2C_SCMI is not set
 
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 CONFIG_I2C_BCM2835=m
-CONFIG_I2C_BCM_IPROC=y
-CONFIG_I2C_BRCMSTB=y
-# CONFIG_I2C_CADENCE is not set
-# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_BCM_IPROC=m
+CONFIG_I2C_BRCMSTB=m
+CONFIG_I2C_CADENCE=m
+CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
-# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DESIGNWARE_PCI=m
 # CONFIG_I2C_EMEV2 is not set
-CONFIG_I2C_EXYNOS5=y
+# CONFIG_I2C_EXYNOS5 is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-# CONFIG_I2C_IMX is not set
+CONFIG_I2C_IMX=m
 CONFIG_I2C_IMX_LPI2C=m
-CONFIG_I2C_MESON=y
-CONFIG_I2C_MT65XX=y
-CONFIG_I2C_MV64XXX=y
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_MESON=m
+CONFIG_I2C_MT65XX=m
+CONFIG_I2C_MV64XXX=m
 # CONFIG_I2C_NOMADIK is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_OWL is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_OWL=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_PXA=m
 # CONFIG_I2C_PXA_SLAVE is not set
-CONFIG_I2C_QUP=y
-# CONFIG_I2C_RIIC is not set
-CONFIG_I2C_RK3X=y
-# CONFIG_I2C_SH_MOBILE is not set
-CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_QCOM_GENI=m
+CONFIG_I2C_QUP=m
+CONFIG_I2C_RK3X=m
+# CONFIG_I2C_SIMTEC is not set
 CONFIG_I2C_SPRD=y
-# CONFIG_I2C_SYNQUACER is not set
-# CONFIG_I2C_TEGRA is not set
-# CONFIG_I2C_TEGRA_BPMP is not set
-# CONFIG_I2C_UNIPHIER is not set
-# CONFIG_I2C_UNIPHIER_F is not set
-CONFIG_I2C_VERSATILE=m
-# CONFIG_I2C_THUNDERX is not set
-# CONFIG_I2C_XILINX is not set
-# CONFIG_I2C_XLP9XX is not set
-# CONFIG_I2C_RCAR is not set
+CONFIG_I2C_SYNQUACER=m
+CONFIG_I2C_TEGRA=m
+CONFIG_I2C_TEGRA_BPMP=m
+# CONFIG_I2C_VERSATILE is not set
+CONFIG_I2C_THUNDERX=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_XLP9XX=m
 
 #
 # External I2C/SMBus adapter drivers
 #
 CONFIG_I2C_DIOLAN_U2C=m
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
 CONFIG_I2C_TINY_USB=m
 CONFIG_I2C_VIPERBOARD=m
 
 #
 # Other I2C/SMBus bus drivers
 #
-CONFIG_I2C_CROS_EC_TUNNEL=y
+CONFIG_I2C_CROS_EC_TUNNEL=m
 CONFIG_I2C_XGENE_SLIMPRO=m
-CONFIG_I2C_ZX2967=y
+CONFIG_I2C_ZX2967=m
 # end of I2C Hardware Bus support
 
 CONFIG_I2C_STUB=m
@@ -4104,50 +4547,53 @@ CONFIG_SPI_ARMADA_3700=m
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_BCM2835AUX=m
-CONFIG_SPI_BCM_QSPI=y
-CONFIG_SPI_BITBANG=y
-# CONFIG_SPI_CADENCE is not set
-# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_BCM_QSPI=m
+CONFIG_SPI_BITBANG=m
+# CONFIG_SPI_BUTTERFLY is not set
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
+# CONFIG_SPI_DW_MID_DMA is not set
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
 CONFIG_SPI_FSL_LPSPI=m
-# CONFIG_SPI_FSL_QUADSPI is not set
+CONFIG_SPI_FSL_QUADSPI=m
 CONFIG_SPI_HISI_SFC_V3XX=m
 CONFIG_SPI_NXP_FLEXSPI=m
-CONFIG_SPI_GPIO=y
+CONFIG_SPI_GPIO=m
 CONFIG_SPI_IMX=m
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_FSL_DSPI is not set
-# CONFIG_SPI_MESON_SPICC is not set
-CONFIG_SPI_MESON_SPIFC=y
-CONFIG_SPI_MT65XX=y
+# CONFIG_SPI_LM70_LLP is not set
+CONFIG_SPI_FSL_LIB=y
+CONFIG_SPI_FSL_SPI=y
+CONFIG_SPI_FSL_DSPI=m
+CONFIG_SPI_MESON_SPICC=m
+# CONFIG_SPI_MESON_SPIFC is not set
+CONFIG_SPI_MT65XX=m
 CONFIG_SPI_MTK_NOR=m
-# CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_ORION=y
-CONFIG_SPI_PL022=y
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_ORION=m
+CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_RSPI is not set
+CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_QCOM_QSPI=m
-CONFIG_SPI_QUP=y
-# CONFIG_SPI_S3C64XX is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SH_MSIOF is not set
-# CONFIG_SPI_SH_HSPI is not set
+CONFIG_SPI_QUP=m
+CONFIG_SPI_QCOM_GENI=m
+CONFIG_SPI_S3C64XX=m
+CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_SLAVE_MT27XX=m
 CONFIG_SPI_SPRD=m
 CONFIG_SPI_SPRD_ADI=m
-# CONFIG_SPI_SUN4I is not set
-# CONFIG_SPI_SUN6I is not set
-# CONFIG_SPI_SYNQUACER is not set
+CONFIG_SPI_SUN4I=m
+CONFIG_SPI_SUN6I=m
+CONFIG_SPI_SYNQUACER=m
 CONFIG_SPI_MXIC=m
-# CONFIG_SPI_TEGRA114 is not set
-# CONFIG_SPI_TEGRA20_SFLASH is not set
-# CONFIG_SPI_TEGRA20_SLINK is not set
-# CONFIG_SPI_THUNDERX is not set
-# CONFIG_SPI_UNIPHIER is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_XLP is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
+CONFIG_SPI_TEGRA20_SFLASH=m
+CONFIG_SPI_THUNDERX=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_XILINX=m
+CONFIG_SPI_XLP=m
+CONFIG_SPI_ZYNQMP_GQSPI=m
 
 #
 # SPI Multiplexer support
@@ -4158,13 +4604,25 @@ CONFIG_SPI_MUX=m
 # SPI Protocol Masters
 #
 CONFIG_SPI_SPIDEV=m
-# CONFIG_SPI_LOOPBACK_TEST is not set
+CONFIG_SPI_LOOPBACK_TEST=m
 # CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_SLAVE is not set
-CONFIG_SPMI=y
-CONFIG_SPMI_MSM_PMIC_ARB=y
-# CONFIG_HSI is not set
-CONFIG_PPS=m
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_SLAVE_TIME=m
+CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPMI=m
+CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=y
 # CONFIG_PPS_DEBUG is not set
 
 #
@@ -4172,6 +4630,7 @@ CONFIG_PPS=m
 #
 # CONFIG_PPS_CLIENT_KTIMER is not set
 CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
 CONFIG_PPS_CLIENT_GPIO=m
 
 #
@@ -4181,11 +4640,13 @@ CONFIG_PPS_CLIENT_GPIO=m
 #
 # PTP clock support
 #
-CONFIG_PTP_1588_CLOCK=m
+CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_DTE=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
-CONFIG_DP83640_PHY=m
-CONFIG_PTP_1588_CLOCK_INES=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # end of PTP clock support
@@ -4197,35 +4658,40 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_AXP209=m
+CONFIG_PINCTRL_AMD=m
 CONFIG_PINCTRL_BM1880=y
-# CONFIG_PINCTRL_MCP23S08 is not set
+CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_STMFX=m
-# CONFIG_PINCTRL_RK805 is not set
-CONFIG_PINCTRL_OCELOT=y
-# CONFIG_PINCTRL_OWL is not set
+CONFIG_PINCTRL_MAX77620=m
+CONFIG_PINCTRL_RK805=m
+# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_PINCTRL_OWL=y
+CONFIG_PINCTRL_S700=y
+CONFIG_PINCTRL_S900=y
 CONFIG_PINCTRL_BCM2835=y
 CONFIG_PINCTRL_IPROC_GPIO=y
 CONFIG_PINCTRL_NS2_MUX=y
-# CONFIG_PINCTRL_AS370 is not set
-# CONFIG_PINCTRL_BERLIN_BG4CT is not set
+CONFIG_PINCTRL_BERLIN=y
+CONFIG_PINCTRL_AS370=y
+CONFIG_PINCTRL_BERLIN_BG4CT=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX_SCU=y
-# CONFIG_PINCTRL_IMX8MM is not set
-# CONFIG_PINCTRL_IMX8MN is not set
-# CONFIG_PINCTRL_IMX8MP is not set
+CONFIG_PINCTRL_IMX8MM=y
+CONFIG_PINCTRL_IMX8MN=y
+CONFIG_PINCTRL_IMX8MP=y
 CONFIG_PINCTRL_IMX8MQ=y
-# CONFIG_PINCTRL_IMX8QM is not set
+CONFIG_PINCTRL_IMX8QM=y
 CONFIG_PINCTRL_IMX8QXP=y
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_AP806=y
 CONFIG_PINCTRL_ARMADA_CP110=y
 CONFIG_PINCTRL_ARMADA_37XX=y
 CONFIG_PINCTRL_MSM=y
-CONFIG_PINCTRL_APQ8064=y
+# CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_APQ8084 is not set
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
@@ -4235,31 +4701,24 @@ CONFIG_PINCTRL_IPQ6018=m
 # CONFIG_PINCTRL_MSM8960 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
 # CONFIG_PINCTRL_MSM8X74 is not set
-CONFIG_PINCTRL_MSM8916=y
-# CONFIG_PINCTRL_MSM8976 is not set
-CONFIG_PINCTRL_MSM8994=m
-CONFIG_PINCTRL_MSM8996=y
-# CONFIG_PINCTRL_MSM8998 is not set
-CONFIG_PINCTRL_QCS404=m
-# CONFIG_PINCTRL_QDF2XXX is not set
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
-CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
+CONFIG_PINCTRL_MSM8916=m
+CONFIG_PINCTRL_MSM8976=m
+# CONFIG_PINCTRL_MSM8994 is not set
+# CONFIG_PINCTRL_MSM8996 is not set
+CONFIG_PINCTRL_MSM8998=m
+# CONFIG_PINCTRL_QCS404 is not set
+CONFIG_PINCTRL_QDF2XXX=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
 CONFIG_PINCTRL_SC7180=m
-CONFIG_PINCTRL_SDM660=m
-# CONFIG_PINCTRL_SDM845 is not set
-# CONFIG_PINCTRL_SM8150 is not set
+# CONFIG_PINCTRL_SDM660 is not set
+CONFIG_PINCTRL_SDM845=m
+CONFIG_PINCTRL_SM8150=m
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS_ARM64=y
-CONFIG_PINCTRL_SH_PFC=y
-CONFIG_PINCTRL_PFC_R8A774A1=y
-CONFIG_PINCTRL_PFC_R8A774C0=y
-CONFIG_PINCTRL_PFC_R8A77950=y
-CONFIG_PINCTRL_PFC_R8A77951=y
-CONFIG_PINCTRL_PFC_R8A77970=y
-CONFIG_PINCTRL_PFC_R8A77995=y
-CONFIG_PINCTRL_SPRD=m
-CONFIG_PINCTRL_SPRD_SC9860=m
+CONFIG_PINCTRL_SPRD=y
+CONFIG_PINCTRL_SPRD_SC9860=y
 CONFIG_PINCTRL_SUNXI=y
 # CONFIG_PINCTRL_SUN4I_A10 is not set
 # CONFIG_PINCTRL_SUN5I is not set
@@ -4283,17 +4742,8 @@ CONFIG_PINCTRL_SUN50I_H6_R=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA124=y
 CONFIG_PINCTRL_TEGRA210=y
+CONFIG_PINCTRL_TEGRA194=y
 CONFIG_PINCTRL_TEGRA_XUSB=y
-CONFIG_PINCTRL_UNIPHIER=y
-# CONFIG_PINCTRL_UNIPHIER_LD4 is not set
-# CONFIG_PINCTRL_UNIPHIER_PRO4 is not set
-# CONFIG_PINCTRL_UNIPHIER_SLD8 is not set
-# CONFIG_PINCTRL_UNIPHIER_PRO5 is not set
-# CONFIG_PINCTRL_UNIPHIER_PXS2 is not set
-# CONFIG_PINCTRL_UNIPHIER_LD6B is not set
-CONFIG_PINCTRL_UNIPHIER_LD11=y
-CONFIG_PINCTRL_UNIPHIER_LD20=y
-CONFIG_PINCTRL_UNIPHIER_PXS3=y
 
 #
 # MediaTek pinctrl drivers
@@ -4311,7 +4761,8 @@ CONFIG_PINCTRL_MT8183=y
 CONFIG_PINCTRL_MT8516=y
 # end of MediaTek pinctrl drivers
 
-# CONFIG_PINCTRL_ZX296718 is not set
+CONFIG_PINCTRL_ZX=y
+CONFIG_PINCTRL_ZX296718=y
 CONFIG_PINCTRL_MESON=y
 CONFIG_PINCTRL_MESON_GXBB=y
 CONFIG_PINCTRL_MESON_GXL=y
@@ -4320,10 +4771,13 @@ CONFIG_PINCTRL_MESON_AXG=y
 CONFIG_PINCTRL_MESON_AXG_PMX=y
 CONFIG_PINCTRL_MESON_G12A=y
 CONFIG_PINCTRL_MESON_A1=y
+CONFIG_PINCTRL_LOCHNAGAR=m
 CONFIG_PINCTRL_MADERA=m
+CONFIG_PINCTRL_CS47L15=y
 CONFIG_PINCTRL_CS47L35=y
 CONFIG_PINCTRL_CS47L85=y
 CONFIG_PINCTRL_CS47L90=y
+CONFIG_PINCTRL_CS47L92=y
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
@@ -4333,77 +4787,87 @@ CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_MAX730X=m
 
 #
 # Memory mapped GPIO drivers
 #
-# CONFIG_GPIO_74XX_MMIO is not set
+CONFIG_GPIO_74XX_MMIO=m
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMDPT is not set
-CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_GPIO_BCM_XGS_IPROC=y
-CONFIG_GPIO_BRCMSTB=y
+CONFIG_GPIO_RASPBERRYPI_EXP=m
+CONFIG_GPIO_BCM_XGS_IPROC=m
+CONFIG_GPIO_BRCMSTB=m
 CONFIG_GPIO_CADENCE=m
-CONFIG_GPIO_DWAPB=y
-# CONFIG_GPIO_EIC_SPRD is not set
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EIC_SPRD=m
 # CONFIG_GPIO_EXAR is not set
-# CONFIG_GPIO_FTGPIO010 is not set
+CONFIG_GPIO_FTGPIO010=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_GRGPIO is not set
+CONFIG_GPIO_GRGPIO=m
 # CONFIG_GPIO_HLWD is not set
 # CONFIG_GPIO_LOGICVC is not set
 CONFIG_GPIO_MB86S7X=m
-# CONFIG_GPIO_MPC8XXX is not set
+CONFIG_GPIO_MPC8XXX=y
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_PL061=y
-# CONFIG_GPIO_PMIC_EIC_SPRD is not set
-# CONFIG_GPIO_RCAR is not set
-CONFIG_GPIO_SAMA5D2_PIOBU=m
+CONFIG_GPIO_PMIC_EIC_SPRD=m
+# CONFIG_GPIO_SAMA5D2_PIOBU is not set
 # CONFIG_GPIO_SIFIVE is not set
-# CONFIG_GPIO_SPRD is not set
+CONFIG_GPIO_SPRD=m
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_TEGRA=y
-CONFIG_GPIO_TEGRA186=y
+CONFIG_GPIO_TEGRA186=m
 CONFIG_GPIO_THUNDERX=m
-CONFIG_GPIO_UNIPHIER=m
 CONFIG_GPIO_XGENE=y
 CONFIG_GPIO_XGENE_SB=m
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_XLP is not set
-# CONFIG_GPIO_ZYNQ is not set
+CONFIG_GPIO_XILINX=m
+CONFIG_GPIO_XLP=m
+CONFIG_GPIO_ZYNQ=m
 # CONFIG_GPIO_ZX is not set
-CONFIG_GPIO_AMD_FCH=m
+# CONFIG_GPIO_AMD_FCH is not set
 # end of Memory mapped GPIO drivers
 
 #
 # I2C GPIO expanders
 #
-# CONFIG_GPIO_ADP5588 is not set
+CONFIG_GPIO_ADP5588=m
 # CONFIG_GPIO_ADNP is not set
 CONFIG_GPIO_GW_PLD=m
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_PCA953X_IRQ=y
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_TPIC2810 is not set
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
 # end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
 #
+CONFIG_GPIO_BD70528=m
+CONFIG_GPIO_BD71828=m
 CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_LP87565=m
 CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77620=m
 CONFIG_GPIO_MAX77650=m
+CONFIG_GPIO_TPS68470=y
 CONFIG_GPIO_TQMX86=m
+# CONFIG_GPIO_WM8994 is not set
 # end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
 #
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
+CONFIG_GPIO_MLXBF=m
+CONFIG_GPIO_MLXBF2=m
+CONFIG_GPIO_PCI_IDIO_16=m
+CONFIG_GPIO_PCIE_IDIO_24=m
 # CONFIG_GPIO_RDC321X is not set
 # end of PCI GPIO expanders
 
@@ -4414,8 +4878,9 @@ CONFIG_GPIO_TQMX86=m
 CONFIG_GPIO_MAX3191X=m
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_XRA1403 is not set
+CONFIG_GPIO_PISOSR=m
+CONFIG_GPIO_XRA1403=m
+CONFIG_GPIO_MOXTET=m
 # end of SPI GPIO expanders
 
 #
@@ -4424,20 +4889,20 @@ CONFIG_GPIO_MAX3191X=m
 CONFIG_GPIO_VIPERBOARD=m
 # end of USB GPIO expanders
 
-# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
 #
 # 1-wire Bus Masters
 #
-# CONFIG_W1_MASTER_MATROX is not set
+CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_MXC=m
 CONFIG_W1_MASTER_DS1WM=m
-# CONFIG_W1_MASTER_GPIO is not set
-CONFIG_W1_MASTER_SGI=m
+CONFIG_W1_MASTER_GPIO=m
+# CONFIG_W1_MASTER_SGI is not set
 # end of 1-wire Bus Masters
 
 #
@@ -4445,9 +4910,9 @@ CONFIG_W1_MASTER_SGI=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
-# CONFIG_W1_SLAVE_DS2405 is not set
+CONFIG_W1_SLAVE_DS2405=m
 CONFIG_W1_SLAVE_DS2408=m
-# CONFIG_W1_SLAVE_DS2408_READBACK is not set
+CONFIG_W1_SLAVE_DS2408_READBACK=y
 CONFIG_W1_SLAVE_DS2413=m
 CONFIG_W1_SLAVE_DS2406=m
 CONFIG_W1_SLAVE_DS2423=m
@@ -4456,7 +4921,7 @@ CONFIG_W1_SLAVE_DS2430=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 CONFIG_W1_SLAVE_DS2433_CRC=y
-# CONFIG_W1_SLAVE_DS2438 is not set
+CONFIG_W1_SLAVE_DS2438=m
 CONFIG_W1_SLAVE_DS250X=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
@@ -4464,65 +4929,76 @@ CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
 # end of 1-wire Slaves
 
-# CONFIG_POWER_AVS is not set
+CONFIG_POWER_AVS=y
+CONFIG_QCOM_CPR=m
+CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_BRCMSTB is not set
+CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_HISI=y
 CONFIG_POWER_RESET_MSM=y
-# CONFIG_POWER_RESET_QCOM_PON is not set
-# CONFIG_POWER_RESET_LTC2952 is not set
+CONFIG_POWER_RESET_QCOM_PON=m
+CONFIG_POWER_RESET_LTC2952=y
 CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-# CONFIG_POWER_RESET_ZX is not set
-CONFIG_REBOOT_MODE=y
-CONFIG_SYSCON_REBOOT_MODE=y
-# CONFIG_POWER_RESET_SC27XX is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
+CONFIG_POWER_RESET_ZX=m
+CONFIG_REBOOT_MODE=m
+CONFIG_SYSCON_REBOOT_MODE=m
+CONFIG_POWER_RESET_SC27XX=m
+CONFIG_NVMEM_REBOOT_MODE=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
-# CONFIG_PDA_POWER is not set
+CONFIG_PDA_POWER=m
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_TEST_POWER is not set
 CONFIG_CHARGER_ADP5061=m
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_LEGO_EV3 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
+CONFIG_BATTERY_CPCAP=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_LEGO_EV3=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
 CONFIG_MANAGER_SBS=m
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
 CONFIG_BATTERY_MAX1721X=m
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_GPIO=m
 # CONFIG_CHARGER_MANAGER is not set
 CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_DETECTOR_MAX14656=m
 CONFIG_CHARGER_MAX77650=m
 CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24190 is not set
-# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ25890=m
 CONFIG_CHARGER_SMB347=m
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_CHARGER_RT9455 is not set
+CONFIG_CHARGER_RT9455=m
 CONFIG_CHARGER_CROS_USBPD=m
-# CONFIG_CHARGER_SC2731 is not set
+CONFIG_CHARGER_SC2731=m
 CONFIG_FUEL_GAUGE_SC27XX=m
 CONFIG_CHARGER_UCS1002=m
+CONFIG_CHARGER_BD70528=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4550,35 +5026,37 @@ CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_AS370=m
 CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_ARM_SCMI=m
 CONFIG_SENSORS_ARM_SCPI=m
-# CONFIG_SENSORS_ASPEED is not set
+CONFIG_SENSORS_ASPEED=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DRIVETEMP=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
-# CONFIG_SENSORS_I5K_AMB is not set
+CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
-# CONFIG_SENSORS_FTSTEUTATES is not set
+CONFIG_SENSORS_FTSTEUTATES=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_G762=m
-# CONFIG_SENSORS_GPIO_FAN is not set
-# CONFIG_SENSORS_HIH6130 is not set
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_HIH6130=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IIO_HWMON=m
+# CONFIG_SENSORS_IIO_HWMON is not set
 CONFIG_SENSORS_IT87=m
-# CONFIG_SENSORS_JC42 is not set
+CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_POWR1220=m
 CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LOCHNAGAR=m
 CONFIG_SENSORS_LTC2945=m
 CONFIG_SENSORS_LTC2947=m
 CONFIG_SENSORS_LTC2947_I2C=m
 CONFIG_SENSORS_LTC2947_SPI=m
-# CONFIG_SENSORS_LTC2990 is not set
+CONFIG_SENSORS_LTC2990=m
 CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4222=m
@@ -4589,17 +5067,19 @@ CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-# CONFIG_SENSORS_MAX31722 is not set
-# CONFIG_SENSORS_MAX31730 is not set
+# CONFIG_SENSORS_MAX197 is not set
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX31730=m
 CONFIG_SENSORS_MAX6621=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
-# CONFIG_SENSORS_MAX31790 is not set
+CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MLXREG_FAN=m
 CONFIG_SENSORS_TC654=m
+# CONFIG_SENSORS_MENF21BMC_HWMON is not set
 # CONFIG_SENSORS_ADCXX is not set
 CONFIG_SENSORS_LM63=m
 # CONFIG_SENSORS_LM70 is not set
@@ -4619,7 +5099,7 @@ CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
 CONFIG_SENSORS_NCT6683=m
 CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
@@ -4631,23 +5111,23 @@ CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_BEL_PFE=m
-CONFIG_SENSORS_IBM_CFFPS=m
+# CONFIG_SENSORS_IBM_CFFPS is not set
 CONFIG_SENSORS_INSPUR_IPSPS=m
-# CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR35221=m
 CONFIG_SENSORS_IR38064=m
-# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_IRPS5401=m
 CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
-# CONFIG_SENSORS_LTC3815 is not set
+CONFIG_SENSORS_LTC3815=m
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX20730=m
-# CONFIG_SENSORS_MAX20751 is not set
+CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
-# CONFIG_SENSORS_PXE1610 is not set
+CONFIG_SENSORS_PXE1610=m
 CONFIG_SENSORS_TPS40422=m
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4663,7 +5143,7 @@ CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_EMC1403=m
-# CONFIG_SENSORS_EMC2103 is not set
+CONFIG_SENSORS_EMC2103=m
 CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
@@ -4671,8 +5151,8 @@ CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
-# CONFIG_SENSORS_STTS751 is not set
-# CONFIG_SENSORS_SMM665 is not set
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_ADC128D818=m
 CONFIG_SENSORS_ADS7828=m
 # CONFIG_SENSORS_ADS7871 is not set
@@ -4692,7 +5172,7 @@ CONFIG_SENSORS_VEXPRESS=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_VT8231=m
-# CONFIG_SENSORS_W83773G is not set
+CONFIG_SENSORS_W83773G=m
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
@@ -4703,44 +5183,42 @@ CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
-# CONFIG_SENSORS_XGENE is not set
+CONFIG_SENSORS_XGENE=m
 
 #
 # ACPI drivers
 #
-CONFIG_SENSORS_ACPI_POWER=m
+# CONFIG_SENSORS_ACPI_POWER is not set
 CONFIG_THERMAL=y
-# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_FREQ_THERMAL=y
 # CONFIG_CPU_IDLE_THERMAL is not set
-# CONFIG_CLOCK_THERMAL is not set
-# CONFIG_DEVFREQ_THERMAL is not set
-CONFIG_THERMAL_EMULATION=y
+CONFIG_CLOCK_THERMAL=y
+CONFIG_DEVFREQ_THERMAL=y
+# CONFIG_THERMAL_EMULATION is not set
 CONFIG_THERMAL_MMIO=m
-CONFIG_HISI_THERMAL=y
+CONFIG_HISI_THERMAL=m
 CONFIG_IMX_THERMAL=m
 CONFIG_IMX_SC_THERMAL=m
 CONFIG_IMX8MM_THERMAL=m
-# CONFIG_QORIQ_THERMAL is not set
-# CONFIG_SUN8I_THERMAL is not set
+CONFIG_MAX77620_THERMAL=m
+CONFIG_QORIQ_THERMAL=m
+CONFIG_SUN8I_THERMAL=m
 CONFIG_ROCKCHIP_THERMAL=m
-# CONFIG_RCAR_THERMAL is not set
-# CONFIG_RCAR_GEN3_THERMAL is not set
-# CONFIG_ARMADA_THERMAL is not set
+CONFIG_ARMADA_THERMAL=m
 CONFIG_MTK_THERMAL=m
 CONFIG_AMLOGIC_THERMAL=m
 
@@ -4751,35 +5229,32 @@ CONFIG_BCM2711_THERMAL=m
 CONFIG_BCM2835_THERMAL=m
 CONFIG_BRCMSTB_THERMAL=m
 CONFIG_BCM_NS_THERMAL=m
-CONFIG_BCM_SR_THERMAL=y
+CONFIG_BCM_SR_THERMAL=m
 # end of Broadcom thermal drivers
 
-# CONFIG_TI_SOC_THERMAL is not set
-
 #
 # Samsung thermal drivers
 #
-# CONFIG_EXYNOS_THERMAL is not set
+CONFIG_EXYNOS_THERMAL=m
 # end of Samsung thermal drivers
 
 #
 # NVIDIA Tegra thermal drivers
 #
-# CONFIG_TEGRA_SOCTHERM is not set
+CONFIG_TEGRA_SOCTHERM=m
 CONFIG_TEGRA_BPMP_THERMAL=m
 # end of NVIDIA Tegra thermal drivers
 
-# CONFIG_GENERIC_ADC_THERMAL is not set
+CONFIG_GENERIC_ADC_THERMAL=m
 
 #
 # Qualcomm thermal drivers
 #
-# CONFIG_QCOM_TSENS is not set
-CONFIG_QCOM_SPMI_TEMP_ALARM=y
+CONFIG_QCOM_TSENS=m
+# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
 # end of Qualcomm thermal drivers
 
-# CONFIG_ZX2967_THERMAL is not set
-CONFIG_UNIPHIER_THERMAL=m
+CONFIG_ZX2967_THERMAL=m
 CONFIG_SPRD_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
@@ -4791,46 +5266,54 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 #
 # Watchdog Pretimeout Governors
 #
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
+CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
+# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
 
 #
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_GPIO_WATCHDOG=m
-# CONFIG_WDAT_WDT is not set
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
+CONFIG_BD70528_WATCHDOG=m
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_MENF21BMC_WATCHDOG is not set
+CONFIG_WDAT_WDT=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_MLX_WDT=m
+# CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_ARM_SBSA_WATCHDOG=m
 CONFIG_ARMADA_37XX_WATCHDOG=m
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
 CONFIG_HAVE_S3C2410_WATCHDOG=y
-# CONFIG_S3C2410_WATCHDOG is not set
+CONFIG_S3C2410_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_SUNXI_WATCHDOG=m
 # CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_IMX2_WDT is not set
+CONFIG_MAX77620_WATCHDOG=m
+CONFIG_IMX2_WDT=m
 CONFIG_IMX_SC_WDT=m
 CONFIG_IMX7ULP_WDT=m
-# CONFIG_TEGRA_WATCHDOG is not set
-CONFIG_QCOM_WDT=m
+CONFIG_TEGRA_WATCHDOG=m
+# CONFIG_QCOM_WDT is not set
 CONFIG_MESON_GXBB_WATCHDOG=m
 CONFIG_MESON_WATCHDOG=m
 CONFIG_MEDIATEK_WATCHDOG=m
-# CONFIG_RENESAS_WDT is not set
-# CONFIG_RENESAS_RZAWDT is not set
-# CONFIG_ZX2967_WATCHDOG is not set
+CONFIG_ZX2967_WATCHDOG=m
 CONFIG_STPMIC1_WATCHDOG=m
-# CONFIG_UNIPHIER_WATCHDOG is not set
 CONFIG_RTD119X_WATCHDOG=y
-# CONFIG_SPRD_WATCHDOG is not set
+CONFIG_SPRD_WATCHDOG=m
 CONFIG_PM8916_WATCHDOG=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_I6300ESB_WDT=m
+CONFIG_KEMPLD_WDT=m
 CONFIG_BCM2835_WDT=m
-# CONFIG_BCM7038_WDT is not set
-# CONFIG_MEN_A21_WDT is not set
+CONFIG_BCM7038_WDT=m
+CONFIG_MEN_A21_WDT=m
 
 #
 # PCI-based Watchdog Cards
@@ -4849,6 +5332,8 @@ CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
@@ -4859,8 +5344,9 @@ CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_HOST_SOC=y
 CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
 CONFIG_BCMA_DRIVER_GMAC_CMN=y
 CONFIG_BCMA_DRIVER_GPIO=y
 # CONFIG_BCMA_DEBUG is not set
@@ -4869,7 +5355,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
-# CONFIG_MFD_ALTERA_SYSMGR is not set
+CONFIG_MFD_ALTERA_SYSMGR=y
 # CONFIG_MFD_ACT8945A is not set
 CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_AS3711 is not set
@@ -4877,21 +5363,22 @@ CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
+CONFIG_MFD_ATMEL_HLCDC=m
 # CONFIG_MFD_BCM590XX is not set
 CONFIG_MFD_BD9571MWV=m
-# CONFIG_MFD_AC100 is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
-CONFIG_MFD_CROS_EC_DEV=y
+CONFIG_MFD_AC100=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_AXP20X_RSB=m
+CONFIG_MFD_CROS_EC_DEV=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
-# CONFIG_MFD_CS47L15 is not set
+CONFIG_MFD_CS47L15=y
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
-# CONFIG_MFD_CS47L92 is not set
+CONFIG_MFD_CS47L92=y
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_DA9052_I2C is not set
@@ -4899,24 +5386,24 @@ CONFIG_MFD_CS47L90=y
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_EXYNOS_LPASS is not set
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_MC13XXX_SPI is not set
 # CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_HI655X_PMIC=y
-# CONFIG_HTC_PASIC3 is not set
+CONFIG_MFD_HI6421_PMIC=m
+CONFIG_MFD_HI655X_PMIC=m
+CONFIG_HTC_PASIC3=m
 # CONFIG_HTC_I2CPLD is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
 CONFIG_MFD_IQS62X=m
 # CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
+CONFIG_MFD_KEMPLD=m
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77620=y
 CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
@@ -4926,45 +5413,44 @@ CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
+CONFIG_MFD_MENF21BMC=m
 # CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_CPCAP=m
 CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_UCB1400_CORE is not set
-CONFIG_MFD_QCOM_RPM=y
-CONFIG_MFD_SPMI_PMIC=y
+CONFIG_MFD_QCOM_RPM=m
+CONFIG_MFD_SPMI_PMIC=m
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_RC5T583 is not set
-CONFIG_MFD_RK808=y
+CONFIG_MFD_RK808=m
 # CONFIG_MFD_RN5T618 is not set
-CONFIG_MFD_SEC_CORE=y
+# CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_SM501 is not set
+CONFIG_MFD_SKY81452=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_SC27XX_PMIC=m
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
 # CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_TI_LMU is not set
+CONFIG_MFD_TI_LMU=m
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_TPS6105X is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TPS6507X is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TPS68470 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
+CONFIG_MFD_TPS68470=y
+CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TI_LP87565=m
 # CONFIG_MFD_TPS65218 is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
@@ -4974,52 +5460,65 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_TWL6040_CORE is not set
 CONFIG_MFD_WL1273_CORE=m
-# CONFIG_MFD_LM3533 is not set
+CONFIG_MFD_LM3533=m
 # CONFIG_MFD_TC3589X is not set
 CONFIG_MFD_TQMX86=m
 CONFIG_MFD_VX855=m
-# CONFIG_MFD_LOCHNAGAR is not set
+CONFIG_MFD_LOCHNAGAR=y
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
-# CONFIG_MFD_ROHM_BD71828 is not set
+CONFIG_MFD_WM8994=m
+CONFIG_MFD_ROHM_BD718XX=m
+CONFIG_MFD_ROHM_BD70528=m
+CONFIG_MFD_ROHM_BD71828=m
 CONFIG_MFD_STPMIC1=m
 CONFIG_MFD_STMFX=m
 CONFIG_MFD_VEXPRESS_SYSREG=y
+# CONFIG_RAVE_SP_CORE is not set
 # end of Multifunction device drivers
 
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_88PG86X is not set
+CONFIG_REGULATOR_88PG86X=m
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_ANATOP is not set
-# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
-# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
-# CONFIG_REGULATOR_BD9571MWV is not set
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BD70528=m
+CONFIG_REGULATOR_BD71828=m
+CONFIG_REGULATOR_BD718XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
-CONFIG_REGULATOR_FAN53555=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_HI655X=y
-# CONFIG_REGULATOR_ISL9305 is not set
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_HI6421V530=m
+CONFIG_REGULATOR_HI655X=m
+CONFIG_REGULATOR_ISL9305=m
 # CONFIG_REGULATOR_ISL6271A is not set
+CONFIG_REGULATOR_LM363X=m
+CONFIG_REGULATOR_LOCHNAGAR=m
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_LP3972 is not set
 # CONFIG_REGULATOR_LP872X is not set
+CONFIG_REGULATOR_LP873X=m
 # CONFIG_REGULATOR_LP8755 is not set
-# CONFIG_REGULATOR_LTC3589 is not set
-# CONFIG_REGULATOR_LTC3676 is not set
+CONFIG_REGULATOR_LP87565=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
 # CONFIG_REGULATOR_MAX1586 is not set
+CONFIG_REGULATOR_MAX77620=m
 CONFIG_REGULATOR_MAX77650=m
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
@@ -5027,40 +5526,41 @@ CONFIG_REGULATOR_MAX77650=m
 # CONFIG_REGULATOR_MAX8973 is not set
 CONFIG_REGULATOR_MCP16502=m
 CONFIG_REGULATOR_MP5416=m
-# CONFIG_REGULATOR_MP8859 is not set
+CONFIG_REGULATOR_MP8859=m
 CONFIG_REGULATOR_MP886X=m
-# CONFIG_REGULATOR_MPQ7920 is not set
+CONFIG_REGULATOR_MPQ7920=m
 # CONFIG_REGULATOR_MT6311 is not set
 CONFIG_REGULATOR_MT6380=m
 # CONFIG_REGULATOR_PFUZE100 is not set
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
-CONFIG_REGULATOR_PWM=y
-CONFIG_REGULATOR_QCOM_RPM=y
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_RPM=m
+CONFIG_REGULATOR_QCOM_RPMH=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
-CONFIG_REGULATOR_QCOM_SPMI=y
-CONFIG_REGULATOR_RK808=y
-# CONFIG_REGULATOR_S2MPA01 is not set
-CONFIG_REGULATOR_S2MPS11=y
-# CONFIG_REGULATOR_S5M8767 is not set
-# CONFIG_REGULATOR_SC2731 is not set
-# CONFIG_REGULATOR_SLG51000 is not set
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_ROHM=m
+CONFIG_REGULATOR_SC2731=m
+CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_SLG51000=m
 CONFIG_REGULATOR_STPMIC1=m
-# CONFIG_REGULATOR_SY8106A is not set
-# CONFIG_REGULATOR_SY8824X is not set
+CONFIG_REGULATOR_SY8106A=m
+CONFIG_REGULATOR_SY8824X=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_TPS65132=m
 # CONFIG_REGULATOR_TPS6524X is not set
-CONFIG_REGULATOR_UNIPHIER=y
-# CONFIG_REGULATOR_VCTRL is not set
-CONFIG_REGULATOR_VEXPRESS=y
-# CONFIG_REGULATOR_VQMMC_IPQ4019 is not set
+CONFIG_REGULATOR_VCTRL=m
+CONFIG_REGULATOR_VEXPRESS=m
+CONFIG_REGULATOR_VQMMC_IPQ4019=m
+CONFIG_REGULATOR_WM8994=m
 CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_LIRC=y
@@ -5074,22 +5574,22 @@ CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_SHARP_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_XMP_DECODER=m
-# CONFIG_IR_IMON_DECODER is not set
+CONFIG_IR_IMON_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_RC_DEVICES=y
 CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
+# CONFIG_IR_ENE is not set
 CONFIG_IR_HIX5HD2=m
 CONFIG_IR_IMON=m
-# CONFIG_IR_IMON_RAW is not set
+CONFIG_IR_IMON_RAW=m
 CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
+# CONFIG_IR_ITE_CIR is not set
+# CONFIG_IR_FINTEK is not set
 CONFIG_IR_MESON=m
-# CONFIG_IR_MTK is not set
-CONFIG_IR_NUVOTON=m
+CONFIG_IR_MTK=m
+# CONFIG_IR_NUVOTON is not set
 CONFIG_IR_REDRAT3=m
-# CONFIG_IR_SPI is not set
+CONFIG_IR_SPI=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_IGORPLUGUSB=m
 CONFIG_IR_IGUANA=m
@@ -5098,10 +5598,10 @@ CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_IR_GPIO_TX=m
 CONFIG_IR_PWM_TX=m
-# CONFIG_IR_SUNXI is not set
+CONFIG_IR_SUNXI=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
-# CONFIG_IR_SIR is not set
+CONFIG_IR_SIR=m
 CONFIG_RC_XBOX_DVD=m
 CONFIG_IR_ZX=m
 CONFIG_MEDIA_SUPPORT=m
@@ -5115,19 +5615,19 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-# CONFIG_MEDIA_CEC_RC is not set
+CONFIG_MEDIA_CEC_RC=y
+# CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_MEDIA_CONTROLLER_DVB=y
-# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
 CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_V4L2_SUBDEV_API is not set
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_I2C=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
-# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
@@ -5252,7 +5752,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
+CONFIG_DVB_USB_CXUSB_ANALOG=y
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -5283,7 +5783,7 @@ CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_USB_DVBSKY=m
-# CONFIG_DVB_USB_ZD1301 is not set
+CONFIG_DVB_USB_ZD1301=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_USB_DRV=m
@@ -5305,22 +5805,22 @@ CONFIG_VIDEO_EM28XX_RC=m
 #
 CONFIG_USB_AIRSPY=m
 CONFIG_USB_HACKRF=m
-# CONFIG_USB_MSI2500 is not set
+CONFIG_USB_MSI2500=m
 
 #
 # USB HDMI CEC adapters
 #
 CONFIG_USB_PULSE8_CEC=m
-# CONFIG_USB_RAINSHADOW_CEC is not set
+CONFIG_USB_RAINSHADOW_CEC=m
 CONFIG_MEDIA_PCI_SUPPORT=y
 
 #
 # Media capture support
 #
 CONFIG_VIDEO_SOLO6X10=m
-# CONFIG_VIDEO_TW5864 is not set
+CONFIG_VIDEO_TW5864=m
 CONFIG_VIDEO_TW68=m
-# CONFIG_VIDEO_TW686X is not set
+CONFIG_VIDEO_TW686X=m
 
 #
 # Media capture/analog TV support
@@ -5383,31 +5883,42 @@ CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
 # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
 CONFIG_DVB_SMIPCIE=m
-# CONFIG_DVB_NETUP_UNIDVB is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_ASPEED=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_CODA=m
 CONFIG_VIDEO_IMX_PXP=m
 CONFIG_VIDEO_MEDIATEK_JPEG=m
 CONFIG_VIDEO_MEDIATEK_VPU=m
 CONFIG_VIDEO_MEDIATEK_MDP=m
-# CONFIG_VIDEO_MEDIATEK_VCODEC is not set
-# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set
-# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
-# CONFIG_VIDEO_SH_VEU is not set
-# CONFIG_VIDEO_RENESAS_JPU is not set
-# CONFIG_VIDEO_RENESAS_FCP is not set
+CONFIG_VIDEO_MEDIATEK_VCODEC=m
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
+CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+CONFIG_VIDEO_SH_VEU=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
-# CONFIG_VIDEO_QCOM_VENUS is not set
+CONFIG_VIDEO_QCOM_VENUS=m
 CONFIG_VIDEO_SUN8I_DEINTERLACE=m
 CONFIG_VIDEO_SUN8I_ROTATE=m
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-# CONFIG_CEC_PLATFORM_DRIVERS is not set
-# CONFIG_SDR_PLATFORM_DRIVERS is not set
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VIM2M=m
+CONFIG_VIDEO_VICODEC=m
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_CEC_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CROS_EC_CEC=m
+CONFIG_VIDEO_MESON_AO_CEC=m
+CONFIG_VIDEO_MESON_G12A_AO_CEC=m
+CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
+CONFIG_VIDEO_TEGRA_HDMI_CEC=m
+CONFIG_SDR_PLATFORM_DRIVERS=y
 
 #
 # Supported MMC/SDIO adapters
@@ -5417,7 +5928,7 @@ CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_TEA575X=m
 CONFIG_RADIO_SI470X=m
 CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
+# CONFIG_I2C_SI470X is not set
 CONFIG_RADIO_SI4713=m
 CONFIG_USB_SI4713=m
 CONFIG_PLATFORM_SI4713=m
@@ -5438,8 +5949,14 @@ CONFIG_RADIO_WL1273=m
 #
 # Texas Instruments WL128x FM driver (ST based)
 #
+CONFIG_RADIO_WL128X=m
 # end of Texas Instruments WL128x FM driver (ST based)
 
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
 CONFIG_MEDIA_COMMON_OPTIONS=y
 
 #
@@ -5461,6 +5978,7 @@ CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
 # CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_VIDEO_V4L2_TPG=m
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
@@ -5479,14 +5997,13 @@ CONFIG_VIDEO_IR_I2C=m
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
-# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
-# CONFIG_VIDEO_TLV320AIC23B is not set
+CONFIG_VIDEO_TLV320AIC23B=m
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -5501,27 +6018,22 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV748X is not set
-# CONFIG_VIDEO_ADV7604 is not set
-# CONFIG_VIDEO_ADV7842 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
-# CONFIG_VIDEO_TC358743 is not set
-# CONFIG_VIDEO_TVP514X is not set
+CONFIG_VIDEO_TVP514X=m
 CONFIG_VIDEO_TVP5150=m
-# CONFIG_VIDEO_TVP7002 is not set
+CONFIG_VIDEO_TVP7002=m
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
 
 #
 # Video and audio decoders
@@ -5533,82 +6045,47 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_AD9389B is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_THS8200 is not set
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_THS8200=m
 
 #
 # Camera sensor devices
 #
-CONFIG_VIDEO_HI556=m
-# CONFIG_VIDEO_IMX214 is not set
-CONFIG_VIDEO_IMX219=m
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX290 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-CONFIG_VIDEO_OV5675=m
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV772X=m
 CONFIG_VIDEO_OV7640=m
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_RJ54N1=m
 
 #
 # Lens drivers
 #
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
+CONFIG_VIDEO_AD5820=m
 
 #
 # Flash devices
 #
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
 
 #
 # Video improvement chips
@@ -5624,27 +6101,25 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # SDR tuner chips
 #
-# CONFIG_SDR_MAX2175 is not set
+CONFIG_SDR_MAX2175=m
 
 #
 # Miscellaneous helper chips
 #
-# CONFIG_VIDEO_THS7303 is not set
+CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
+CONFIG_VIDEO_I2C=m
 # end of I2C Encoders, decoders, sensors and other helper chips
 
 #
 # SPI helper chips
 #
-# CONFIG_VIDEO_GS1662 is not set
 # end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
-# CONFIG_CXD2880_SPI_DRV is not set
+CONFIG_CXD2880_SPI_DRV=m
 # end of Media SPI Adapters
 
 CONFIG_MEDIA_TUNER=m
@@ -5660,7 +6135,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
-# CONFIG_MEDIA_TUNER_MSI001 is not set
+CONFIG_MEDIA_TUNER_MSI001=m
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5754,7 +6229,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
+CONFIG_DVB_S5H1432=m
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5765,7 +6240,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
-# CONFIG_DVB_DIB9000 is not set
+CONFIG_DVB_DIB9000=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5777,9 +6252,9 @@ CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
-# CONFIG_DVB_ZD1301_DEMOD is not set
+CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
-# CONFIG_DVB_CXD2880 is not set
+CONFIG_DVB_CXD2880=m
 
 #
 # DVB-C (cable) frontends
@@ -5817,7 +6292,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
-# CONFIG_DVB_MN88443X is not set
+CONFIG_DVB_MN88443X=m
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5831,23 +6306,23 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
-# CONFIG_DVB_LNBH29 is not set
+CONFIG_DVB_LNBH29=m
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
-# CONFIG_DVB_LGS8GL5 is not set
+CONFIG_DVB_LGS8GL5=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
 CONFIG_DVB_IX2505V=m
 CONFIG_DVB_M88RS2000=m
 CONFIG_DVB_AF9033=m
-# CONFIG_DVB_HORUS3A is not set
-# CONFIG_DVB_ASCOT2E is not set
-# CONFIG_DVB_HELENE is not set
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
 
 #
 # Common Interface (EN50221) controller drivers
@@ -5871,7 +6346,7 @@ CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
+CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
@@ -5888,7 +6363,6 @@ CONFIG_DRM_TTM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
 #
@@ -5897,7 +6371,7 @@ CONFIG_DRM_SCHED=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+CONFIG_DRM_I2C_NXP_TDA9950=m
 # end of I2C encoder or helper chips
 
 #
@@ -5912,15 +6386,15 @@ CONFIG_DRM_KOMEDA=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
-# CONFIG_DRM_AMDGPU_CIK is not set
-# CONFIG_DRM_AMDGPU_USERPTR is not set
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
-# CONFIG_DRM_AMD_ACP is not set
+CONFIG_DRM_AMD_ACP=y
 # end of ACP (Audio CoProcessor) Configuration
 
 #
@@ -5931,26 +6405,42 @@ CONFIG_DRM_AMD_DC=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 # end of Display Engine Configuration
 
-# CONFIG_HSA_AMD is not set
+CONFIG_HSA_AMD=y
 CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_VGEM=m
-# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_NOUVEAU_SVM=y
+# CONFIG_DRM_VGEM is not set
+CONFIG_DRM_VKMS=m
 # CONFIG_DRM_EXYNOS is not set
+CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_CDN_DP=y
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_INNO_HDMI=y
+CONFIG_ROCKCHIP_LVDS=y
+CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_RK3066_HDMI=y
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_CIRRUS_QEMU=m
-# CONFIG_DRM_RCAR_DU is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
+CONFIG_DRM_RCAR_DW_HDMI=m
+CONFIG_DRM_RCAR_LVDS=m
 CONFIG_DRM_RCAR_WRITEBACK=y
-# CONFIG_DRM_SUN4I is not set
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
+CONFIG_DRM_SUN4I_HDMI_CEC=y
+CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN6I_DSI=m
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_VIRTIO_GPU=m
@@ -5968,60 +6458,60 @@ CONFIG_DRM_MSM_DSI_14NM_PHY=y
 CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
-CONFIG_DRM_TEGRA_STAGING=y
+# CONFIG_DRM_TEGRA_STAGING is not set
 CONFIG_DRM_PANEL=y
 
 #
 # Display Panels
 #
-# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
-# CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
-# CONFIG_DRM_PANEL_LVDS is not set
+CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
-# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
-# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+CONFIG_DRM_PANEL_ILITEK_IL9322=m
+CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
+CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
+CONFIG_DRM_PANEL_JDI_LT070ME05000=m
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
-# CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
+CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 CONFIG_DRM_PANEL_LG_LB035Q02=m
-# CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LG_LG4573=m
 CONFIG_DRM_PANEL_NEC_NL8048HL11=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT39016=m
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
-# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
-# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
+CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
-# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
 CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
 CONFIG_DRM_PANEL_RONBO_RB070D30=m
 CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
-# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E63M0=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
-# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
-# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SITRONIX_ST7701=m
-# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
+CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
+CONFIG_DRM_PANEL_SONY_ACX424AKP=m
 CONFIG_DRM_PANEL_SONY_ACX565AKM=m
 CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
 CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
-# CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
+CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
 # end of Display Panels
 
 CONFIG_DRM_BRIDGE=y
@@ -6030,34 +6520,35 @@ CONFIG_DRM_PANEL_BRIDGE=y
 #
 # Display Interface Bridges
 #
-# CONFIG_DRM_CDNS_DSI is not set
+CONFIG_DRM_CDNS_DSI=m
 CONFIG_DRM_DISPLAY_CONNECTOR=m
-# CONFIG_DRM_LVDS_CODEC is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_LVDS_CODEC=m
+CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW=m
 CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_PARADE_PS8640=m
 CONFIG_DRM_SIL_SII8620=m
-# CONFIG_DRM_SII902X is not set
+CONFIG_DRM_SII902X=m
 CONFIG_DRM_SII9234=m
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
+CONFIG_DRM_THINE_THC63LVD1024=m
 CONFIG_DRM_TOSHIBA_TC358764=m
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
+CONFIG_DRM_TOSHIBA_TC358767=m
 CONFIG_DRM_TOSHIBA_TC358768=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TPD12S015=m
-# CONFIG_DRM_ANALOGIX_ANX6345 is not set
+CONFIG_DRM_ANALOGIX_ANX6345=m
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_ANALOGIX_DP=m
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_DW_HDMI=m
-# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
-# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_DW_MIPI_DSI=m
 # end of Display Interface Bridges
 
 CONFIG_DRM_VC4=m
@@ -6069,9 +6560,8 @@ CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_HISI_KIRIN=m
 CONFIG_DRM_MEDIATEK=m
 CONFIG_DRM_MEDIATEK_HDMI=m
-# CONFIG_DRM_ZTE is not set
-CONFIG_DRM_MXS=y
-CONFIG_DRM_MXSFB=m
+CONFIG_DRM_ZTE=m
+# CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_GM12U320=m
@@ -6083,17 +6573,12 @@ CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
-# CONFIG_DRM_PL111 is not set
+CONFIG_DRM_PL111=m
 CONFIG_DRM_LIMA=m
 CONFIG_DRM_PANFROST=m
 CONFIG_DRM_TIDSS=m
-CONFIG_DRM_LEGACY=y
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
+# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
 # Frame buffer Devices
@@ -6102,6 +6587,7 @@ CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -6120,18 +6606,18 @@ CONFIG_FB_TILEBLITTING=y
 #
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
-CONFIG_FB_ARMCLCD=y
+# CONFIG_FB_ARMCLCD is not set
 CONFIG_FB_IMX=m
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_UVESA is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_UVESA=m
+CONFIG_FB_EFI=y
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
+CONFIG_FB_I740=m
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set
@@ -6148,18 +6634,18 @@ CONFIG_FB_IMX=m
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
 # CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SH_MOBILE_LCDC is not set
-# CONFIG_FB_SM501 is not set
-# CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_UDL=m
+CONFIG_FB_SMSCUFX=m
+# CONFIG_FB_UDL is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 CONFIG_FB_XILINX=m
 CONFIG_FB_VIRTUAL=m
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_MX3=y
-CONFIG_FB_SIMPLE=y
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
 # end of Frame buffer Devices
 
@@ -6178,23 +6664,26 @@ CONFIG_LCD_PLATFORM=m
 # CONFIG_LCD_AMS369FG06 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_HX8357 is not set
-# CONFIG_LCD_OTM3225A is not set
+CONFIG_LCD_OTM3225A=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_LM3533=m
 CONFIG_BACKLIGHT_PWM=m
-# CONFIG_BACKLIGHT_QCOM_WLED is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
 CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_SKY81452=m
 CONFIG_BACKLIGHT_GPIO=m
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
 CONFIG_BACKLIGHT_LED=m
 # end of Backlight & LCD device support
 
+CONFIG_VGASTATE=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
 
@@ -6207,18 +6696,15 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 # end of Console display driver support
 
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 # end of Graphics support
 
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
@@ -6239,11 +6725,14 @@ CONFIG_SND_PCM_TIMER=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VERBOSE_PRINTK=y
+CONFIG_SND_DEBUG=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
+CONFIG_SND_PCM_XRUN_DEBUG=y
+# CONFIG_SND_CTL_VALIDATION is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
@@ -6263,21 +6752,23 @@ CONFIG_SND_DUMMY=m
 CONFIG_SND_ALOOP=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALI5451=m
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALI5451 is not set
 CONFIG_SND_ATIIXP=m
 CONFIG_SND_ATIIXP_MODEM=m
 CONFIG_SND_AU8810=m
 CONFIG_SND_AU8820=m
 CONFIG_SND_AU8830=m
-# CONFIG_SND_AW2 is not set
-CONFIG_SND_AZT3328=m
+CONFIG_SND_AW2=m
+# CONFIG_SND_AZT3328 is not set
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
 CONFIG_SND_CA0106=m
@@ -6302,28 +6793,24 @@ CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
 CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
 CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-# CONFIG_SND_ES1968_INPUT is not set
-# CONFIG_SND_ES1968_RADIO is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
+# CONFIG_SND_ICE1712 is not set
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_LOLA=m
 CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-# CONFIG_SND_MAESTRO3_INPUT is not set
+# CONFIG_SND_MAESTRO3 is not set
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
 CONFIG_SND_PCXHR=m
@@ -6344,11 +6831,11 @@ CONFIG_SND_YMFPCI=m
 #
 CONFIG_SND_HDA=m
 CONFIG_SND_HDA_INTEL=m
-# CONFIG_SND_HDA_TEGRA is not set
+CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_CODEC_REALTEK=m
 CONFIG_SND_HDA_CODEC_ANALOG=m
@@ -6363,13 +6850,14 @@ CONFIG_SND_HDA_CODEC_CA0132_DSP=y
 CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
 # end of HD-Audio
 
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_ALIGNED_MMIO=y
 CONFIG_SND_HDA_COMPONENT=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_HDA_PREALLOC_SIZE=1024
 CONFIG_SND_INTEL_NHLT=y
 CONFIG_SND_INTEL_DSP_CONFIG=m
 CONFIG_SND_SPI=y
@@ -6381,24 +6869,40 @@ CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_USB_LINE6=m
 CONFIG_SND_USB_POD=m
 CONFIG_SND_USB_PODHD=m
 CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_TOPOLOGY=y
 CONFIG_SND_SOC_ACPI=m
 CONFIG_SND_SOC_AMD_ACP=m
-# CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BCM63XX_I2S_WHISTLER=m
-# CONFIG_SND_DESIGNWARE_I2S is not set
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_DESIGNWARE_PCM=y
 
 #
 # SoC Audio for Freescale CPUs
@@ -6407,9 +6911,9 @@ CONFIG_SND_BCM63XX_I2S_WHISTLER=m
 #
 # Common SoC Audio options for Freescale CPUs:
 #
-# CONFIG_SND_SOC_FSL_ASRC is not set
+CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_SAI=m
-# CONFIG_SND_SOC_FSL_MQS is not set
+CONFIG_SND_SOC_FSL_MQS=m
 CONFIG_SND_SOC_FSL_AUDMIX=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
@@ -6429,17 +6933,15 @@ CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_IMX_AUDMIX=m
 # end of SoC Audio for Freescale CPUs
 
-# CONFIG_SND_I2S_HI6210_I2S is not set
-# CONFIG_SND_KIRKWOOD_SOC is not set
+CONFIG_SND_I2S_HI6210_I2S=m
+CONFIG_SND_KIRKWOOD_SOC=m
+CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
 # CONFIG_SND_SOC_IMG is not set
 CONFIG_SND_SOC_MEDIATEK=m
 # CONFIG_SND_SOC_MT2701 is not set
-# CONFIG_SND_SOC_MT6797 is not set
-CONFIG_SND_SOC_MT8173=m
-CONFIG_SND_SOC_MT8173_MAX98090=m
-CONFIG_SND_SOC_MT8173_RT5650=m
-CONFIG_SND_SOC_MT8173_RT5650_RT5514=m
-CONFIG_SND_SOC_MT8173_RT5650_RT5676=m
+CONFIG_SND_SOC_MT6797=m
+CONFIG_SND_SOC_MT6797_MT6351=m
+# CONFIG_SND_SOC_MT8173 is not set
 CONFIG_SND_SOC_MT8183=m
 CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
 CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
@@ -6449,38 +6951,62 @@ CONFIG_SND_SOC_MTK_BTCVSD=m
 # ASoC support for Amlogic platforms
 #
 CONFIG_SND_MESON_AIU=m
-# CONFIG_SND_MESON_AXG_FRDDR is not set
-# CONFIG_SND_MESON_AXG_TODDR is not set
-# CONFIG_SND_MESON_AXG_TDMIN is not set
-# CONFIG_SND_MESON_AXG_TDMOUT is not set
-# CONFIG_SND_MESON_AXG_SOUND_CARD is not set
-# CONFIG_SND_MESON_AXG_SPDIFOUT is not set
+CONFIG_SND_MESON_AXG_FIFO=m
+CONFIG_SND_MESON_AXG_FRDDR=m
+CONFIG_SND_MESON_AXG_TODDR=m
+CONFIG_SND_MESON_AXG_TDM_FORMATTER=m
+CONFIG_SND_MESON_AXG_TDM_INTERFACE=m
+CONFIG_SND_MESON_AXG_TDMIN=m
+CONFIG_SND_MESON_AXG_TDMOUT=m
+CONFIG_SND_MESON_AXG_SOUND_CARD=m
+CONFIG_SND_MESON_AXG_SPDIFOUT=m
 CONFIG_SND_MESON_AXG_SPDIFIN=m
 CONFIG_SND_MESON_AXG_PDM=m
 CONFIG_SND_MESON_CARD_UTILS=m
 CONFIG_SND_MESON_CODEC_GLUE=m
 CONFIG_SND_MESON_GX_SOUND_CARD=m
 CONFIG_SND_MESON_G12A_TOACODEC=m
-# CONFIG_SND_MESON_G12A_TOHDMITX is not set
+CONFIG_SND_MESON_G12A_TOHDMITX=m
 CONFIG_SND_SOC_MESON_T9015=m
 # end of ASoC support for Amlogic platforms
 
 CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
+CONFIG_SND_SOC_LPASS_IPQ806X=m
 CONFIG_SND_SOC_LPASS_APQ8016=m
-# CONFIG_SND_SOC_STORM is not set
+CONFIG_SND_SOC_STORM=m
 CONFIG_SND_SOC_APQ8016_SBC=m
-# CONFIG_SND_SOC_ROCKCHIP is not set
-# CONFIG_SND_SOC_SAMSUNG is not set
-
-#
-# SoC Audio support for Renesas SoCs
-#
-# CONFIG_SND_SOC_SH4_FSI is not set
-# CONFIG_SND_SOC_RCAR is not set
-# end of SoC Audio support for Renesas SoCs
-
+CONFIG_SND_SOC_QCOM_COMMON=m
+CONFIG_SND_SOC_QDSP6_COMMON=m
+CONFIG_SND_SOC_QDSP6_CORE=m
+CONFIG_SND_SOC_QDSP6_AFE=m
+CONFIG_SND_SOC_QDSP6_AFE_DAI=m
+CONFIG_SND_SOC_QDSP6_ADM=m
+CONFIG_SND_SOC_QDSP6_ROUTING=m
+CONFIG_SND_SOC_QDSP6_ASM=m
+CONFIG_SND_SOC_QDSP6_ASM_DAI=m
+CONFIG_SND_SOC_QDSP6=m
+CONFIG_SND_SOC_MSM8996=m
+CONFIG_SND_SOC_SDM845=m
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=m
+CONFIG_SND_SOC_ROCKCHIP_PDM=m
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
+CONFIG_SND_SOC_ROCKCHIP_RT5645=m
+CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
+CONFIG_SND_SOC_RK3399_GRU_SOUND=m
+CONFIG_SND_SOC_SAMSUNG=m
+CONFIG_SND_SAMSUNG_PCM=m
+CONFIG_SND_SAMSUNG_SPDIF=m
+CONFIG_SND_SAMSUNG_I2S=m
+CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
+CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
+CONFIG_SND_SOC_SMDK_WM8994_PCM=m
+CONFIG_SND_SOC_SNOW=m
+# CONFIG_SND_SOC_ODROID is not set
+# CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI=m
 CONFIG_SND_SOC_SOF_ACPI=m
@@ -6488,9 +7014,11 @@ CONFIG_SND_SOC_SOF_OF=m
 # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
 # CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
 CONFIG_SND_SOC_SOF=m
-# CONFIG_SND_SOC_SOF_IMX_TOPLEVEL is not set
+CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y
+CONFIG_SND_SOC_SOF_IMX8=m
 CONFIG_SND_SOC_SPRD=m
-# CONFIG_SND_SOC_SPRD_MCDT is not set
+CONFIG_SND_SOC_SPRD_MCDT=m
 
 #
 # STMicroelectronics STM32 SOC audio support
@@ -6500,181 +7028,211 @@ CONFIG_SND_SOC_SPRD=m
 #
 # Allwinner SoC Audio support
 #
-# CONFIG_SND_SUN4I_CODEC is not set
+CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SUN8I_CODEC=m
-# CONFIG_SND_SUN8I_CODEC_ANALOG is not set
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
 CONFIG_SND_SUN50I_CODEC_ANALOG=m
-# CONFIG_SND_SUN4I_I2S is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
+CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
 # end of Allwinner SoC Audio support
 
-# CONFIG_SND_SOC_TEGRA is not set
-# CONFIG_SND_SOC_UNIPHIER is not set
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
-# CONFIG_SND_SOC_XTFPGA_I2S is not set
+CONFIG_SND_SOC_XTFPGA_I2S=m
 # CONFIG_ZX_SPDIF is not set
 # CONFIG_ZX_I2S is not set
-# CONFIG_ZX_TDM is not set
+CONFIG_ZX_TDM=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
 # CODEC drivers
 #
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_ADAU1701 is not set
-# CONFIG_SND_SOC_ADAU1761_I2C is not set
-# CONFIG_SND_SOC_ADAU1761_SPI is not set
-# CONFIG_SND_SOC_ADAU7002 is not set
-# CONFIG_SND_SOC_ADAU7118_HW is not set
-# CONFIG_SND_SOC_ADAU7118_I2C is not set
-# CONFIG_SND_SOC_AK4104 is not set
+CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+CONFIG_SND_SOC_AK4104=m
 CONFIG_SND_SOC_AK4118=m
-# CONFIG_SND_SOC_AK4458 is not set
-# CONFIG_SND_SOC_AK4554 is not set
-# CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4642 is not set
-# CONFIG_SND_SOC_AK5386 is not set
-# CONFIG_SND_SOC_AK5558 is not set
-# CONFIG_SND_SOC_ALC5623 is not set
-# CONFIG_SND_SOC_BD28623 is not set
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_BD28623=m
 CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CPCAP=m
 CONFIG_SND_SOC_CROS_EC_CODEC=m
-# CONFIG_SND_SOC_CS35L32 is not set
-# CONFIG_SND_SOC_CS35L33 is not set
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
 CONFIG_SND_SOC_CS35L34=m
-# CONFIG_SND_SOC_CS35L35 is not set
+CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
 CONFIG_SND_SOC_CS42L42=m
-# CONFIG_SND_SOC_CS42L51_I2C is not set
-# CONFIG_SND_SOC_CS42L52 is not set
-# CONFIG_SND_SOC_CS42L56 is not set
-# CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_CS4270 is not set
-# CONFIG_SND_SOC_CS4271_I2C is not set
-# CONFIG_SND_SOC_CS4271_SPI is not set
-# CONFIG_SND_SOC_CS42XX8_I2C is not set
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
-# CONFIG_SND_SOC_CS4349 is not set
-# CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CX2072X is not set
-# CONFIG_SND_SOC_DA7213 is not set
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_CX2072X=m
+CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
-# CONFIG_SND_SOC_ES7134 is not set
-# CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8316 is not set
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
-# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_GTM601=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_LOCHNAGAR_SC=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_MAX98357A=m
-# CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX9867 is not set
-# CONFIG_SND_SOC_MAX98927 is not set
-# CONFIG_SND_SOC_MAX98373 is not set
-# CONFIG_SND_SOC_MAX9860 is not set
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
-# CONFIG_SND_SOC_PCM1681 is not set
-# CONFIG_SND_SOC_PCM1789_I2C is not set
-# CONFIG_SND_SOC_PCM179X_I2C is not set
-# CONFIG_SND_SOC_PCM179X_SPI is not set
-# CONFIG_SND_SOC_PCM186X_I2C is not set
-# CONFIG_SND_SOC_PCM186X_SPI is not set
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX9860=m
+# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
 CONFIG_SND_SOC_PCM3060=m
 CONFIG_SND_SOC_PCM3060_I2C=m
 CONFIG_SND_SOC_PCM3060_SPI=m
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
 CONFIG_SND_SOC_RK3328=m
 CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT5514=m
-# CONFIG_SND_SOC_RT5616 is not set
-# CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
 CONFIG_SND_SOC_RT5645=m
-CONFIG_SND_SOC_RT5677=m
-CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_RT5682_SDW=m
+CONFIG_SND_SOC_RT700=m
+CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711=m
+CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_RT715_SDW=m
 CONFIG_SND_SOC_SGTL5000=m
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
-# CONFIG_SND_SOC_SPDIF is not set
-# CONFIG_SND_SOC_SSM2305 is not set
-# CONFIG_SND_SOC_SSM2602_SPI is not set
-# CONFIG_SND_SOC_SSM2602_I2C is not set
-# CONFIG_SND_SOC_SSM4567 is not set
-# CONFIG_SND_SOC_STA32X is not set
-# CONFIG_SND_SOC_STA350 is not set
-# CONFIG_SND_SOC_STI_SAS is not set
-# CONFIG_SND_SOC_TAS2552 is not set
-# CONFIG_SND_SOC_TAS2562 is not set
-# CONFIG_SND_SOC_TAS2770 is not set
-# CONFIG_SND_SOC_TAS5086 is not set
-# CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_SND_SOC_TAS5720 is not set
-# CONFIG_SND_SOC_TAS6424 is not set
-# CONFIG_SND_SOC_TDA7419 is not set
-# CONFIG_SND_SOC_TFA9879 is not set
-# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC3X is not set
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS2562=m
+CONFIG_SND_SOC_TAS2770=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TLV320ADCX140=m
 CONFIG_SND_SOC_TS3A227E=m
-# CONFIG_SND_SOC_TSCS42XX is not set
-# CONFIG_SND_SOC_TSCS454 is not set
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
 CONFIG_SND_SOC_UDA1334=m
-# CONFIG_SND_SOC_WM8510 is not set
-# CONFIG_SND_SOC_WM8523 is not set
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8524=m
-# CONFIG_SND_SOC_WM8580 is not set
-# CONFIG_SND_SOC_WM8711 is not set
-# CONFIG_SND_SOC_WM8728 is not set
-# CONFIG_SND_SOC_WM8731 is not set
-# CONFIG_SND_SOC_WM8737 is not set
-# CONFIG_SND_SOC_WM8741 is not set
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8770 is not set
-# CONFIG_SND_SOC_WM8776 is not set
-# CONFIG_SND_SOC_WM8782 is not set
-# CONFIG_SND_SOC_WM8804_I2C is not set
-# CONFIG_SND_SOC_WM8804_SPI is not set
-# CONFIG_SND_SOC_WM8903 is not set
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8904=m
-# CONFIG_SND_SOC_WM8960 is not set
-# CONFIG_SND_SOC_WM8962 is not set
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM8978 is not set
-# CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
-# CONFIG_SND_SOC_MAX9759 is not set
-# CONFIG_SND_SOC_MT6351 is not set
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WM8994=m
+CONFIG_SND_SOC_WSA881X=m
+CONFIG_SND_SOC_ZX_AUD96P22=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
 CONFIG_SND_SOC_MT6358=m
-# CONFIG_SND_SOC_MT6660 is not set
-# CONFIG_SND_SOC_NAU8540 is not set
-# CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_MT6660=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
-# CONFIG_SND_SOC_NAU8824 is not set
-# CONFIG_SND_SOC_TPA6130A2 is not set
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_TPA6130A2=m
 # end of CODEC drivers
 
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-CONFIG_SND_SYNTH_EMUX=m
+CONFIG_SND_AUDIO_GRAPH_CARD=m
 CONFIG_AC97_BUS=m
 
 #
@@ -6684,18 +7242,18 @@ CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
-CONFIG_HID_GENERIC=y
+CONFIG_HID_GENERIC=m
 
 #
 # Special HID drivers
 #
 CONFIG_HID_A4TECH=m
-# CONFIG_HID_ACCUTOUCH is not set
+CONFIG_HID_ACCUTOUCH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_APPLEIR=m
-# CONFIG_HID_ASUS is not set
+CONFIG_HID_ASUS=m
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
@@ -6706,14 +7264,14 @@ CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
 CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
+# CONFIG_HID_CMEDIA is not set
 CONFIG_HID_CP2112=m
 CONFIG_HID_CREATIVE_SB0540=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
-# CONFIG_HID_ELAN is not set
+CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
@@ -6722,7 +7280,7 @@ CONFIG_HID_GFRM=m
 CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
-# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_HAMMER=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -6731,8 +7289,8 @@ CONFIG_HID_WALTOP=m
 CONFIG_HID_VIEWSONIC=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_ICADE=m
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
@@ -6748,11 +7306,11 @@ CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MALTRON=m
 CONFIG_HID_MAYFLASH=m
-# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_REDRAGON=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NTI is not set
+CONFIG_HID_NTI=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
@@ -6767,7 +7325,7 @@ CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PRIMAX=m
-# CONFIG_HID_RETRODE is not set
+CONFIG_HID_RETRODE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
@@ -6797,16 +7355,23 @@ CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-# CONFIG_HID_ALPS is not set
+CONFIG_HID_ALPS=m
 CONFIG_HID_MCP2221=m
 # end of Special HID drivers
 
 #
 # USB HID support
 #
-CONFIG_USB_HID=y
+CONFIG_USB_HID=m
 CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
 # end of USB HID support
 
 #
@@ -6820,10 +7385,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_LED_TRIG=y
-CONFIG_USB_ULPI_BUS=y
+CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m
 CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=y
+CONFIG_USB=m
 CONFIG_USB_PCI=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
@@ -6832,52 +7397,54 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 #
 CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
+CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+CONFIG_USB_OTG_FSM=m
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=y
+CONFIG_USB_MON=m
 
 #
 # USB Host Controller Drivers
 #
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=y
-CONFIG_USB_XHCI_PLATFORM=y
-# CONFIG_USB_XHCI_HISTB is not set
-CONFIG_USB_XHCI_MTK=y
-CONFIG_USB_XHCI_MVEBU=y
-CONFIG_USB_XHCI_RCAR=y
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_XHCI_HISTB=m
+CONFIG_USB_XHCI_MTK=m
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_USB_XHCI_TEGRA=m
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_EHCI_PCI=m
 CONFIG_USB_EHCI_FSL=m
 CONFIG_USB_EHCI_MXC=m
-CONFIG_USB_EHCI_HCD_ORION=y
-CONFIG_USB_EHCI_TEGRA=y
-# CONFIG_USB_EHCI_EXYNOS is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-CONFIG_USB_MAX3421_HCD=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_PCI=y
-# CONFIG_USB_OHCI_EXYNOS is not set
-CONFIG_USB_OHCI_HCD_PLATFORM=y
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_USB_EHCI_TEGRA=m
+CONFIG_USB_EHCI_EXYNOS=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_HCD_ISO=y
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_BCMA is not set
-# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
 # CONFIG_USB_HCD_TEST_MODE is not set
-# CONFIG_USB_RENESAS_USBHS is not set
 
 #
 # USB Device Class drivers
@@ -6894,23 +7461,23 @@ CONFIG_USB_TMC=m
 #
 # also be needed; see USB_STORAGE Help for more info
 #
-CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=y
+CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
-CONFIG_USB_STORAGE_ENE_UB6250=y
-CONFIG_USB_UAS=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
 
 #
 # USB Imaging devices
@@ -6930,11 +7497,11 @@ CONFIG_USB_CDNS3_HOST=y
 CONFIG_USB_CDNS3_PCI_WRAP=m
 CONFIG_USB_CDNS3_IMX=m
 CONFIG_USB_MTU3=m
-# CONFIG_USB_MTU3_HOST is not set
+CONFIG_USB_MTU3_HOST=y
 # CONFIG_USB_MTU3_GADGET is not set
-CONFIG_USB_MTU3_DUAL_ROLE=y
+# CONFIG_USB_MTU3_DUAL_ROLE is not set
 # CONFIG_USB_MTU3_DEBUG is not set
-CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_HOST=y
 # CONFIG_USB_MUSB_GADGET is not set
 # CONFIG_USB_MUSB_DUAL_ROLE is not set
@@ -6942,44 +7509,41 @@ CONFIG_USB_MUSB_HOST=y
 #
 # Platform Glue Layer
 #
-# CONFIG_USB_MUSB_MEDIATEK is not set
+CONFIG_USB_MUSB_SUNXI=m
+CONFIG_USB_MUSB_MEDIATEK=m
 
 #
 # MUSB DMA mode
 #
-# CONFIG_MUSB_PIO_ONLY is not set
-CONFIG_USB_DWC3=y
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_ULPI=y
-CONFIG_USB_DWC3_HOST=y
+# CONFIG_USB_DWC3_HOST is not set
 # CONFIG_USB_DWC3_GADGET is not set
-# CONFIG_USB_DWC3_DUAL_ROLE is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
 
 #
 # Platform Glue Driver Support
 #
-CONFIG_USB_DWC3_EXYNOS=y
-CONFIG_USB_DWC3_PCI=y
-CONFIG_USB_DWC3_HAPS=y
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
 CONFIG_USB_DWC3_MESON_G12A=m
-CONFIG_USB_DWC3_OF_SIMPLE=y
-CONFIG_USB_DWC3_QCOM=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_DWC2_HOST=y
+CONFIG_USB_DWC3_OF_SIMPLE=m
+CONFIG_USB_DWC3_QCOM=m
+CONFIG_USB_DWC2=m
+# CONFIG_USB_DWC2_HOST is not set
 
 #
 # Gadget/Dual-role mode requires USB Gadget support to be enabled
 #
 # CONFIG_USB_DWC2_PERIPHERAL is not set
-# CONFIG_USB_DWC2_DUAL_ROLE is not set
-CONFIG_USB_DWC2_PCI=y
+CONFIG_USB_DWC2_DUAL_ROLE=y
+CONFIG_USB_DWC2_PCI=m
 # CONFIG_USB_DWC2_DEBUG is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_OF=y
-CONFIG_USB_CHIPIDEA_PCI=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_ISP1760=y
+# CONFIG_USB_CHIPIDEA is not set
+CONFIG_USB_ISP1760=m
 CONFIG_USB_ISP1760_HCD=y
 CONFIG_USB_ISP1760_HOST_ROLE=y
 # CONFIG_USB_ISP1760_GADGET_ROLE is not set
@@ -6988,8 +7552,8 @@ CONFIG_USB_ISP1760_HOST_ROLE=y
 #
 # USB port drivers
 #
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_CONSOLE=y
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_SIMPLE=m
 CONFIG_USB_SERIAL_AIRCABLE=m
@@ -7019,6 +7583,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_METRO=m
 CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 CONFIG_USB_SERIAL_MOS7840=m
 CONFIG_USB_SERIAL_MXUPORT=m
 CONFIG_USB_SERIAL_NAVMAN=m
@@ -7042,7 +7607,7 @@ CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
-# CONFIG_USB_SERIAL_UPD78F0730 is not set
+CONFIG_USB_SERIAL_UPD78F0730=m
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -7054,8 +7619,8 @@ CONFIG_USB_ADUTUX=m
 CONFIG_USB_SEVSEG=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
@@ -7066,17 +7631,17 @@ CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
 # CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+CONFIG_USB_EHSET_TEST_FIXTURE=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
-# CONFIG_USB_HUB_USB251XB is not set
-CONFIG_USB_HSIC_USB3503=y
-CONFIG_USB_HSIC_USB4604=y
-# CONFIG_USB_LINK_LAYER_TEST is not set
-CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_LINK_LAYER_TEST=m
+# CONFIG_USB_CHAOSKEY is not set
 CONFIG_USB_ATM=m
-# CONFIG_USB_SPEEDTOUCH is not set
+CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
@@ -7085,22 +7650,22 @@ CONFIG_USB_XUSBATM=m
 # USB Physical Layer drivers
 #
 CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=y
+CONFIG_NOP_USB_XCEIV=m
 # CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ISP1301 is not set
+CONFIG_USB_ISP1301=m
 CONFIG_USB_MXS_PHY=m
-CONFIG_USB_TEGRA_PHY=y
+CONFIG_USB_TEGRA_PHY=m
 CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 # end of USB Physical Layer drivers
 
-CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=500
+CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-# CONFIG_U_SERIAL_CONSOLE is not set
+CONFIG_U_SERIAL_CONSOLE=y
 
 #
 # USB Peripheral Controller
@@ -7109,78 +7674,123 @@ CONFIG_USB_FSL_USB2=m
 # CONFIG_USB_FOTG210_UDC is not set
 # CONFIG_USB_GR_UDC is not set
 # CONFIG_USB_R8A66597 is not set
-# CONFIG_USB_RENESAS_USB3 is not set
 # CONFIG_USB_PXA27X is not set
 # CONFIG_USB_MV_UDC is not set
 # CONFIG_USB_MV_U3D is not set
-# CONFIG_USB_SNP_UDC_PLAT is not set
+CONFIG_USB_SNP_CORE=m
+CONFIG_USB_SNP_UDC_PLAT=m
 # CONFIG_USB_M66592 is not set
-# CONFIG_USB_BDC_UDC is not set
+CONFIG_USB_BDC_UDC=m
+
+#
+# Platform Support
+#
+CONFIG_USB_BDC_PCI=m
 # CONFIG_USB_AMD5536UDC is not set
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_NET2280 is not set
 # CONFIG_USB_GOKU is not set
 # CONFIG_USB_EG20T is not set
-# CONFIG_USB_GADGET_XILINX is not set
+CONFIG_USB_GADGET_XILINX=m
 CONFIG_USB_MAX3420_UDC=m
+CONFIG_USB_TEGRA_XUDC=m
 # CONFIG_USB_DUMMY_HCD is not set
 # end of USB Peripheral Controller
 
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
 CONFIG_USB_U_SERIAL=m
 CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
 CONFIG_USB_F_SERIAL=m
 CONFIG_USB_F_OBEX=m
 CONFIG_USB_F_NCM=m
 CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
 CONFIG_USB_F_EEM=m
 CONFIG_USB_F_SUBSET=m
 CONFIG_USB_F_RNDIS=m
 CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
 CONFIG_USB_F_HID=m
-# CONFIG_USB_CONFIGFS is not set
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_CONFIGFS_F_TCM=y
 
 #
 # USB Gadget precomposed configurations
 #
 # CONFIG_USB_ZERO is not set
-# CONFIG_USB_AUDIO is not set
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 CONFIG_USB_ETH_EEM=y
 CONFIG_USB_G_NCM=m
 CONFIG_USB_GADGETFS=m
-# CONFIG_USB_FUNCTIONFS is not set
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
 CONFIG_USB_MASS_STORAGE=m
-# CONFIG_USB_GADGET_TARGET is not set
+CONFIG_USB_GADGET_TARGET=m
 CONFIG_USB_G_SERIAL=m
-# CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
 CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_NOKIA=m
 CONFIG_USB_G_ACM_MS=m
 CONFIG_USB_G_MULTI=m
 CONFIG_USB_G_MULTI_RNDIS=y
 CONFIG_USB_G_MULTI_CDC=y
 CONFIG_USB_G_HID=m
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_WEBCAM is not set
-# CONFIG_USB_RAW_GADGET is not set
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_USB_RAW_GADGET=m
 # end of USB Gadget precomposed configurations
 
 CONFIG_TYPEC=m
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
-# CONFIG_TYPEC_RT1711H is not set
+CONFIG_TYPEC_RT1711H=m
 CONFIG_TYPEC_FUSB302=m
-# CONFIG_TYPEC_UCSI is not set
-# CONFIG_TYPEC_HD3SS3220 is not set
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_TYPEC_HD3SS3220=m
 CONFIG_TYPEC_TPS6598X=m
 
 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
-# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+CONFIG_TYPEC_MUX_PI3USB30532=m
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
@@ -7190,13 +7800,13 @@ CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_NVIDIA_ALTMODE=m
 # end of USB Type-C Alternate Mode drivers
 
-CONFIG_USB_ROLE_SWITCH=y
-CONFIG_MMC=y
-CONFIG_PWRSEQ_EMMC=y
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=32
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_MMC=m
+CONFIG_PWRSEQ_EMMC=m
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 
@@ -7204,68 +7814,64 @@ CONFIG_SDIO_UART=m
 # MMC/SD/SDIO Host Controller Drivers
 #
 # CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_ARMMMCI=y
-# CONFIG_MMC_QCOM_DML is not set
+CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_QCOM_DML=y
 CONFIG_MMC_STM32_SDMMC=y
-CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_PCI=y
+CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_OF_ARASAN=y
-CONFIG_MMC_SDHCI_OF_ASPEED=m
-CONFIG_MMC_SDHCI_OF_AT91=y
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
+# CONFIG_MMC_SDHCI_OF_ASPEED is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
+CONFIG_MMC_SDHCI_OF_DWCMSHC=m
 CONFIG_MMC_SDHCI_CADENCE=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
-CONFIG_MMC_SDHCI_TEGRA=y
-CONFIG_MMC_SDHCI_PXAV3=y
-CONFIG_MMC_SDHCI_F_SDH30=y
+CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MMC_SDHCI_F_SDH30=m
 # CONFIG_MMC_SDHCI_MILBEAUT is not set
-CONFIG_MMC_SDHCI_IPROC=y
-CONFIG_MMC_MESON_GX=y
-CONFIG_MMC_MESON_MX_SDIO=y
+CONFIG_MMC_SDHCI_IPROC=m
+CONFIG_MMC_MESON_GX=m
+# CONFIG_MMC_MESON_MX_SDIO is not set
 CONFIG_MMC_ALCOR=m
-CONFIG_MMC_SDHCI_MSM=y
-CONFIG_MMC_MXC=m
-CONFIG_MMC_TIFM_SD=y
-CONFIG_MMC_SPI=y
+CONFIG_MMC_SDHCI_MSM=m
+# CONFIG_MMC_MXC is not set
+CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_SDHCI_SPRD=m
-CONFIG_MMC_TMIO_CORE=m
-# CONFIG_MMC_SDHI is not set
-CONFIG_MMC_UNIPHIER=m
-CONFIG_MMC_CB710=y
-CONFIG_MMC_VIA_SDMMC=y
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_CAVIUM_THUNDERX=m
-CONFIG_MMC_DW=y
-CONFIG_MMC_DW_PLTFM=y
-# CONFIG_MMC_DW_BLUEFIELD is not set
-CONFIG_MMC_DW_EXYNOS=y
-# CONFIG_MMC_DW_HI3798CV200 is not set
-CONFIG_MMC_DW_K3=y
-CONFIG_MMC_DW_PCI=y
-CONFIG_MMC_DW_ROCKCHIP=y
-# CONFIG_MMC_DW_ZX is not set
-# CONFIG_MMC_SH_MMCIF is not set
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_PLTFM=m
+CONFIG_MMC_DW_BLUEFIELD=m
+CONFIG_MMC_DW_EXYNOS=m
+CONFIG_MMC_DW_HI3798CV200=m
+CONFIG_MMC_DW_K3=m
+CONFIG_MMC_DW_PCI=m
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_MMC_DW_ZX=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_USHC=m
-# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_USDHI6ROL0=m
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_SUNXI=y
-CONFIG_MMC_CQHCI=y
+CONFIG_MMC_SUNXI=m
+CONFIG_MMC_CQHCI=m
 CONFIG_MMC_HSQ=m
-CONFIG_MMC_TOSHIBA_PCI=y
+CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_BCM2835=m
-CONFIG_MMC_MTK=y
-CONFIG_MMC_SDHCI_BRCMSTB=y
-CONFIG_MMC_SDHCI_XENON=y
-CONFIG_MMC_SDHCI_OMAP=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_BRCMSTB=m
+CONFIG_MMC_SDHCI_XENON=m
+# CONFIG_MMC_SDHCI_OMAP is not set
 CONFIG_MMC_SDHCI_AM654=m
-# CONFIG_MMC_OWL is not set
-CONFIG_MMC_SDHCI_EXTERNAL_DMA=y
+CONFIG_MMC_OWL=m
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -7274,7 +7880,7 @@ CONFIG_MEMSTICK=m
 #
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
+CONFIG_MS_BLOCK=m
 
 #
 # MemoryStick Host Controller Drivers
@@ -7287,7 +7893,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 
 #
 # LED drivers
@@ -7297,91 +7903,139 @@ CONFIG_LEDS_AN30259A=m
 CONFIG_LEDS_AS3645A=m
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
-# CONFIG_LEDS_CR0014114 is not set
-# CONFIG_LEDS_EL15203000 is not set
+CONFIG_LEDS_CPCAP=m
+CONFIG_LEDS_CR0014114=m
+CONFIG_LEDS_EL15203000=m
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3532=m
-# CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_LM3601X is not set
-# CONFIG_LEDS_PCA9532 is not set
-CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_LM3692X=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP3944=m
-# CONFIG_LEDS_LP3952 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+CONFIG_LEDS_LP8860=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA955X_GPIO=y
 CONFIG_LEDS_PCA963X=m
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_PWM=m
 # CONFIG_LEDS_REGULATOR is not set
-# CONFIG_LEDS_BD2802 is not set
+CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_LT3593=m
-# CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_TCA6507=m
 # CONFIG_LEDS_TLC591XX is not set
 CONFIG_LEDS_MAX77650=m
-# CONFIG_LEDS_LM355x is not set
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
 # CONFIG_LEDS_KTD2692 is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-# CONFIG_LEDS_SC27XX_BLTC is not set
+CONFIG_LEDS_IS31FL319X=m
+CONFIG_LEDS_IS31FL32XX=m
+CONFIG_LEDS_SC27XX_BLTC=m
 
 #
 # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 #
 CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_SYSCON is not set
-# CONFIG_LEDS_MLXREG is not set
+CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
-# CONFIG_LEDS_SPI_BYTE is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
+CONFIG_LEDS_SPI_BYTE=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM3697=m
+CONFIG_LEDS_LM36274=m
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_LEDS_TRIGGER_TRANSIENT=y
-CONFIG_LEDS_TRIGGER_CAMERA=y
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
-# CONFIG_LEDS_TRIGGER_NETDEV is not set
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_PATTERN=m
 CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-# CONFIG_INFINIBAND is not set
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_I40IW=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
+CONFIG_INFINIBAND_HNS=m
+CONFIG_INFINIBAND_HNS_HIP06=y
+CONFIG_INFINIBAND_HNS_HIP08=y
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-# CONFIG_EDAC_LAYERSCAPE is not set
+CONFIG_EDAC_DEBUG=y
+CONFIG_EDAC_GHES=y
+CONFIG_EDAC_LAYERSCAPE=m
 CONFIG_EDAC_THUNDERX=m
-# CONFIG_EDAC_ALTERA is not set
+CONFIG_EDAC_ALTERA=y
+CONFIG_EDAC_ALTERA_SDRAM=y
+CONFIG_EDAC_ALTERA_OCRAM=y
+CONFIG_EDAC_ALTERA_ETHERNET=y
+CONFIG_EDAC_ALTERA_NAND=y
+CONFIG_EDAC_ALTERA_USB=y
+CONFIG_EDAC_ALTERA_QSPI=y
+CONFIG_EDAC_ALTERA_SDMMC=y
 CONFIG_EDAC_SYNOPSYS=m
 CONFIG_EDAC_XGENE=m
+CONFIG_EDAC_QCOM=m
+CONFIG_EDAC_BLUEFIELD=m
 CONFIG_EDAC_DMC520=m
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_SYSTOHC is not set
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 # CONFIG_RTC_DEBUG is not set
 CONFIG_RTC_NVMEM=y
 
@@ -7397,22 +8051,24 @@ CONFIG_RTC_INTF_DEV=y
 #
 # I2C RTC drivers
 #
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
+CONFIG_RTC_DRV_ABB5ZES3=m
 CONFIG_RTC_DRV_ABEOZ9=m
 CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_BRCMSTB=y
+CONFIG_RTC_DRV_AC100=m
+CONFIG_RTC_DRV_BRCMSTB=m
 CONFIG_RTC_DRV_DS1307=m
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1307_CENTURY=y
 CONFIG_RTC_DRV_DS1374=m
 CONFIG_RTC_DRV_DS1374_WDT=y
 CONFIG_RTC_DRV_DS1672=m
 # CONFIG_RTC_DRV_HYM8563 is not set
 CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX77686=m
 CONFIG_RTC_DRV_RK808=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-# CONFIG_RTC_DRV_ISL12026 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF85063=m
@@ -7421,16 +8077,16 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-# CONFIG_RTC_DRV_S35390A is not set
+CONFIG_RTC_DRV_BD70528=m
+# CONFIG_RTC_DRV_BQ32K is not set
+CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
-# CONFIG_RTC_DRV_RX8010 is not set
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RX8010=m
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
 CONFIG_RTC_DRV_RV3028=m
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_S5M is not set
+CONFIG_RTC_DRV_RV8803=y
 CONFIG_RTC_DRV_SD3078=m
 
 #
@@ -7443,7 +8099,7 @@ CONFIG_RTC_DRV_SD3078=m
 # CONFIG_RTC_DRV_DS1343 is not set
 # CONFIG_RTC_DRV_DS1347 is not set
 # CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX6916=m
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RX4581 is not set
 # CONFIG_RTC_DRV_RX6110 is not set
@@ -7459,68 +8115,67 @@ CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_DS3232_HWMON=y
 CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
+# CONFIG_RTC_DRV_RV3029C2 is not set
 
 #
 # Platform RTC drivers
 #
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
 CONFIG_RTC_DRV_DS1685_FAMILY=m
 CONFIG_RTC_DRV_DS1685=y
 # CONFIG_RTC_DRV_DS1689 is not set
 # CONFIG_RTC_DRV_DS17285 is not set
 # CONFIG_RTC_DRV_DS17485 is not set
 # CONFIG_RTC_DRV_DS17885 is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
 CONFIG_RTC_DRV_EFI=y
-CONFIG_RTC_DRV_STK17TA8=m
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 CONFIG_RTC_DRV_SC27XX=m
-# CONFIG_RTC_DRV_ZYNQMP is not set
-# CONFIG_RTC_DRV_CROS_EC is not set
+CONFIG_RTC_DRV_ZYNQMP=y
+CONFIG_RTC_DRV_CROS_EC=m
 
 #
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_IMXDI=m
-CONFIG_RTC_DRV_FSL_FTM_ALARM=y
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
 CONFIG_RTC_DRV_MESON_VRTC=m
 CONFIG_HAVE_S3C_RTC=y
-# CONFIG_RTC_DRV_S3C is not set
-# CONFIG_RTC_DRV_SH is not set
-# CONFIG_RTC_DRV_PL030 is not set
+CONFIG_RTC_DRV_S3C=m
+CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_SUN6I=y
-# CONFIG_RTC_DRV_MV is not set
-# CONFIG_RTC_DRV_ARMADA38X is not set
+CONFIG_RTC_DRV_MV=y
+CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_CADENCE=m
-# CONFIG_RTC_DRV_FTRTC010 is not set
-CONFIG_RTC_DRV_PM8XXX=y
-# CONFIG_RTC_DRV_TEGRA is not set
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_PM8XXX=m
+CONFIG_RTC_DRV_TEGRA=m
 CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_MXC_V2=m
 # CONFIG_RTC_DRV_SNVS is not set
-CONFIG_RTC_DRV_IMX_SC=m
-CONFIG_RTC_DRV_MT2712=m
+CONFIG_RTC_DRV_IMX_SC=y
+CONFIG_RTC_DRV_MT2712=y
 CONFIG_RTC_DRV_MT7622=m
-CONFIG_RTC_DRV_XGENE=m
+CONFIG_RTC_DRV_XGENE=y
 CONFIG_RTC_DRV_R7301=m
+CONFIG_RTC_DRV_CPCAP=m
 CONFIG_RTC_DRV_RTD119X=y
 
 #
 # HID Sensor RTC drivers
 #
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -7535,47 +8190,45 @@ CONFIG_DMA_OF=y
 CONFIG_ALTERA_MSGDMA=m
 # CONFIG_AMBA_PL08X is not set
 CONFIG_AXI_DMAC=m
-# CONFIG_BCM_SBA_RAID is not set
-CONFIG_DMA_BCM2835=y
-# CONFIG_DMA_SUN6I is not set
-# CONFIG_DW_AXI_DMAC is not set
-# CONFIG_FSL_EDMA is not set
+CONFIG_BCM_SBA_RAID=m
+CONFIG_DMA_BCM2835=m
+CONFIG_DMA_SUN6I=m
+CONFIG_DW_AXI_DMAC=m
+CONFIG_FSL_EDMA=m
 CONFIG_FSL_QDMA=m
 CONFIG_HISI_DMA=m
 CONFIG_IMX_DMA=m
 CONFIG_IMX_SDMA=m
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_K3_DMA is not set
+CONFIG_K3_DMA=m
 CONFIG_MV_XOR=y
 CONFIG_MV_XOR_V2=y
-# CONFIG_MXS_DMA is not set
+CONFIG_MXS_DMA=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
-# CONFIG_OWL_DMA is not set
-CONFIG_PL330_DMA=m
+CONFIG_OWL_DMA=m
+# CONFIG_PL330_DMA is not set
 CONFIG_PLX_DMA=m
 CONFIG_SPRD_DMA=m
-CONFIG_TEGRA20_APB_DMA=y
+# CONFIG_TEGRA20_APB_DMA is not set
 CONFIG_TEGRA210_ADMA=y
-CONFIG_UNIPHIER_MDMAC=m
-CONFIG_UNIPHIER_XDMAC=m
 CONFIG_XGENE_DMA=m
-# CONFIG_XILINX_DMA is not set
-# CONFIG_XILINX_ZYNQMP_DMA is not set
-# CONFIG_ZX_DMA is not set
-# CONFIG_MTK_HSDMA is not set
+CONFIG_XILINX_DMA=m
+CONFIG_XILINX_ZYNQMP_DMA=m
+CONFIG_ZX_DMA=m
+CONFIG_MTK_HSDMA=m
 CONFIG_MTK_CQDMA=m
-CONFIG_QCOM_BAM_DMA=y
-CONFIG_QCOM_HIDMA_MGMT=y
-CONFIG_QCOM_HIDMA=y
+CONFIG_MTK_UART_APDMA=m
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
+# CONFIG_DW_DMAC is not set
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 # CONFIG_SF_PDMA is not set
-# CONFIG_RCAR_DMAC is not set
-# CONFIG_RENESAS_USB_DMAC is not set
+CONFIG_FSL_DPAA2_QDMA=m
 
 #
 # DMA Clients
@@ -7588,7 +8241,7 @@ CONFIG_DMA_ENGINE_RAID=y
 # DMABUF options
 #
 CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
+CONFIG_SW_SYNC=y
 CONFIG_UDMABUF=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_SELFTESTS is not set
@@ -7596,22 +8249,28 @@ CONFIG_UDMABUF=y
 # end of DMABUF options
 
 CONFIG_AUXDISPLAY=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_IMG_ASCII_LCD is not set
 CONFIG_HT16K33=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
 # CONFIG_CHARLCD_BL_OFF is not set
 # CONFIG_CHARLCD_BL_ON is not set
 CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_CHARLCD=m
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
-# CONFIG_UIO_NETX is not set
+CONFIG_UIO_NETX=m
 # CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_MF624 is not set
+CONFIG_UIO_MF624=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VFIO=m
@@ -7619,24 +8278,23 @@ CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
-CONFIG_VFIO_PLATFORM=m
-CONFIG_VFIO_AMBA=m
-CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m
-CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
-CONFIG_VFIO_PLATFORM_BCMFLEXRM_RESET=m
+# CONFIG_VFIO_PLATFORM is not set
 CONFIG_VFIO_MDEV=m
 CONFIG_VFIO_MDEV_DEVICE=m
-# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
-# CONFIG_VIRTIO_PMEM is not set
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_PMEM=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-# CONFIG_VDPA is not set
+CONFIG_VDPA=m
+CONFIG_VDPA_SIM=m
+CONFIG_IFCVF=m
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST_RING=m
 CONFIG_VHOST_DPN=y
@@ -7645,6 +8303,7 @@ CONFIG_VHOST_MENU=y
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
 #
@@ -7655,7 +8314,36 @@ CONFIG_VHOST_VSOCK=m
 # CONFIG_GREYBUS is not set
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
-# CONFIG_COMEDI is not set
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+# CONFIG_COMEDI_MISC_DRIVERS is not set
+# CONFIG_COMEDI_ISA_DRIVERS is not set
+# CONFIG_COMEDI_PCI_DRIVERS is not set
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
 CONFIG_RTL8192U=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
@@ -7666,9 +8354,9 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-# CONFIG_RTS5208 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
 
 #
 # IIO staging drivers
@@ -7677,81 +8365,94 @@ CONFIG_88EU_AP_MODE=y
 #
 # Accelerometers
 #
-CONFIG_ADIS16203=m
-CONFIG_ADIS16240=m
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
 # end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7816=m
-CONFIG_AD7280=m
+# CONFIG_AD7816 is not set
+# CONFIG_AD7280 is not set
 # end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
 #
-CONFIG_ADT7316=m
-CONFIG_ADT7316_SPI=m
-CONFIG_ADT7316_I2C=m
+# CONFIG_ADT7316 is not set
 # end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
-CONFIG_AD7150=m
-CONFIG_AD7746=m
+# CONFIG_AD7150 is not set
+# CONFIG_AD7746 is not set
 # end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
-CONFIG_AD9832=m
-CONFIG_AD9834=m
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
 # end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
-CONFIG_AD5933=m
+# CONFIG_AD5933 is not set
 # end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
 #
-CONFIG_ADE7854=m
-CONFIG_ADE7854_I2C=m
-CONFIG_ADE7854_SPI=m
+# CONFIG_ADE7854 is not set
 # end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
-CONFIG_AD2S1210=m
+# CONFIG_AD2S1210 is not set
 # end of Resolver to digital converters
 # end of IIO staging drivers
 
-# CONFIG_FB_SM750 is not set
-# CONFIG_USB_EMXX is not set
+CONFIG_FB_SM750=m
 
 #
 # Speakup console speech
 #
-# CONFIG_SPEAKUP is not set
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
 # end of Speakup console speech
 
-# CONFIG_MFD_NVEC is not set
+CONFIG_MFD_NVEC=m
+CONFIG_KEYBOARD_NVEC=m
+CONFIG_SERIO_NVEC_PS2=m
+CONFIG_NVEC_POWER=m
+CONFIG_NVEC_PAZ00=m
 CONFIG_STAGING_MEDIA=y
-# CONFIG_VIDEO_ALLEGRO_DVT is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
-# CONFIG_VIDEO_SUNXI is not set
-# CONFIG_TEGRA_VDE is not set
+CONFIG_VIDEO_ALLEGRO_DVT=m
+CONFIG_VIDEO_HANTRO=m
+CONFIG_VIDEO_HANTRO_IMX8M=y
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
+CONFIG_VIDEO_MESON_VDEC=m
+CONFIG_VIDEO_SUNXI=y
+CONFIG_VIDEO_SUNXI_CEDRUS=m
+CONFIG_TEGRA_VDE=m
 
 #
 # soc_camera sensor drivers
 #
-# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_VIDEO_USBVISION=m
 
 #
@@ -7760,10 +8461,13 @@ CONFIG_VIDEO_USBVISION=m
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
-# CONFIG_LTE_GDM724X is not set
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
 CONFIG_FB_TFT=m
 CONFIG_FB_TFT_AGM1264K_FL=m
 CONFIG_FB_TFT_BD663474=m
@@ -7797,46 +8501,56 @@ CONFIG_FB_TFT_UC1611=m
 CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
 CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FSL_DPAA2=y
+CONFIG_FSL_DPAA2_ETHSW=m
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
-# CONFIG_KS7010 is not set
+CONFIG_KS7010=m
 CONFIG_BCM_VIDEOCORE=m
 CONFIG_BCM2835_VCHIQ=m
-# CONFIG_SND_BCM2835 is not set
+CONFIG_SND_BCM2835=m
 CONFIG_VIDEO_BCM2835=m
 CONFIG_PI433=m
 
 #
 # Gasket devices
 #
-# CONFIG_STAGING_GASKET_FRAMEWORK is not set
+CONFIG_STAGING_GASKET_FRAMEWORK=m
+CONFIG_STAGING_APEX_DRIVER=m
 # end of Gasket devices
 
 CONFIG_XIL_AXIS_FIFO=m
-# CONFIG_FIELDBUS_DEV is not set
+CONFIG_FIELDBUS_DEV=m
+CONFIG_HMS_ANYBUSS_BUS=m
+CONFIG_ARCX_ANYBUS_CONTROLLER=m
+CONFIG_HMS_PROFINET=m
 # CONFIG_KPC2000 is not set
 CONFIG_QLGE=m
 CONFIG_WFX=m
 # CONFIG_GOLDFISH is not set
-CONFIG_MFD_CROS_EC=y
+CONFIG_MFD_CROS_EC=m
 CONFIG_CHROME_PLATFORMS=y
-# CONFIG_CHROMEOS_TBMC is not set
-CONFIG_CROS_EC=y
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC=m
 CONFIG_CROS_EC_I2C=m
 CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_EC_PROTO=y
-CONFIG_CROS_KBD_LED_BACKLIGHT=y
-CONFIG_CROS_EC_CHARDEV=y
-CONFIG_CROS_EC_LIGHTBAR=y
-CONFIG_CROS_EC_VBC=y
-CONFIG_CROS_EC_DEBUGFS=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_VBC=m
+# CONFIG_CROS_EC_DEBUGFS is not set
 CONFIG_CROS_EC_SENSORHUB=m
-CONFIG_CROS_EC_SYSFS=y
+CONFIG_CROS_EC_SYSFS=m
 CONFIG_CROS_EC_TYPEC=m
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=m
-# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_MELLANOX_PLATFORM=y
+CONFIG_MLXREG_HOTPLUG=m
+CONFIG_MLXREG_IO=m
+CONFIG_MLXBF_TMFIFO=m
+CONFIG_MLXBF_BOOTCTL=m
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -7848,51 +8562,55 @@ CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_VEXPRESS_OSC=y
 # CONFIG_CLK_HSDK is not set
-# CONFIG_COMMON_CLK_MAX9485 is not set
-CONFIG_COMMON_CLK_RK808=y
+CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_HI655X=m
-CONFIG_COMMON_CLK_SCPI=y
-# CONFIG_COMMON_CLK_SI5341 is not set
+CONFIG_COMMON_CLK_SCMI=m
+CONFIG_COMMON_CLK_SCPI=m
+CONFIG_COMMON_CLK_SI5341=m
 # CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
+CONFIG_COMMON_CLK_SI514=m
+CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 CONFIG_COMMON_CLK_BM1880=y
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_FSL_SAI is not set
-# CONFIG_COMMON_CLK_S2MPS11 is not set
-# CONFIG_CLK_QORIQ is not set
-CONFIG_CLK_LS1028A_PLLDIG=y
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CDCE925=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_COMMON_CLK_FSL_SAI=y
+CONFIG_CLK_QORIQ=y
+CONFIG_CLK_LS1028A_PLLDIG=m
 CONFIG_COMMON_CLK_XGENE=y
-# CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+CONFIG_COMMON_CLK_LOCHNAGAR=m
+CONFIG_COMMON_CLK_PWM=m
+CONFIG_COMMON_CLK_VC5=m
+CONFIG_COMMON_CLK_BD718XX=m
+CONFIG_COMMON_CLK_FIXED_MMIO=y
 CONFIG_CLK_ACTIONS=y
-CONFIG_CLK_OWL_S500=y
+# CONFIG_CLK_OWL_S500 is not set
 CONFIG_CLK_OWL_S700=y
 CONFIG_CLK_OWL_S900=y
 CONFIG_CLK_BCM2835=y
 CONFIG_COMMON_CLK_IPROC=y
 CONFIG_CLK_BCM_NS2=y
 CONFIG_CLK_BCM_SR=y
-# CONFIG_CLK_RASPBERRYPI is not set
-CONFIG_COMMON_CLK_HI3516CV300=m
-CONFIG_COMMON_CLK_HI3519=y
+CONFIG_CLK_RASPBERRYPI=m
+# CONFIG_COMMON_CLK_HI3516CV300 is not set
+CONFIG_COMMON_CLK_HI3519=m
 CONFIG_COMMON_CLK_HI3660=y
 CONFIG_COMMON_CLK_HI3670=y
 CONFIG_COMMON_CLK_HI3798CV200=m
 CONFIG_COMMON_CLK_HI6220=y
 CONFIG_RESET_HISI=y
 CONFIG_STUB_CLK_HI6220=y
-# CONFIG_STUB_CLK_HI3660 is not set
+CONFIG_STUB_CLK_HI3660=y
 CONFIG_MXC_CLK=y
-# CONFIG_CLK_IMX8MM is not set
-# CONFIG_CLK_IMX8MN is not set
-# CONFIG_CLK_IMX8MP is not set
-# CONFIG_CLK_IMX8MQ is not set
-# CONFIG_CLK_IMX8QXP is not set
+CONFIG_MXC_CLK_SCU=y
+CONFIG_CLK_IMX8MM=y
+CONFIG_CLK_IMX8MN=y
+CONFIG_CLK_IMX8MP=y
+CONFIG_CLK_IMX8MQ=y
+CONFIG_CLK_IMX8QXP=y
 
 #
 # Clock driver for MediaTek SoC
@@ -7907,51 +8625,53 @@ CONFIG_COMMON_CLK_MT2712_MMSYS=y
 CONFIG_COMMON_CLK_MT2712_VDECSYS=y
 CONFIG_COMMON_CLK_MT2712_VENCSYS=y
 CONFIG_COMMON_CLK_MT6779=y
-# CONFIG_COMMON_CLK_MT6779_MMSYS is not set
-# CONFIG_COMMON_CLK_MT6779_IMGSYS is not set
-# CONFIG_COMMON_CLK_MT6779_IPESYS is not set
-# CONFIG_COMMON_CLK_MT6779_CAMSYS is not set
-# CONFIG_COMMON_CLK_MT6779_VDECSYS is not set
-# CONFIG_COMMON_CLK_MT6779_VENCSYS is not set
-# CONFIG_COMMON_CLK_MT6779_MFGCFG is not set
-# CONFIG_COMMON_CLK_MT6779_AUDSYS is not set
+CONFIG_COMMON_CLK_MT6779_MMSYS=y
+CONFIG_COMMON_CLK_MT6779_IMGSYS=y
+CONFIG_COMMON_CLK_MT6779_IPESYS=y
+CONFIG_COMMON_CLK_MT6779_CAMSYS=y
+CONFIG_COMMON_CLK_MT6779_VDECSYS=y
+CONFIG_COMMON_CLK_MT6779_VENCSYS=y
+CONFIG_COMMON_CLK_MT6779_MFGCFG=y
+CONFIG_COMMON_CLK_MT6779_AUDSYS=y
 CONFIG_COMMON_CLK_MT6797=y
-# CONFIG_COMMON_CLK_MT6797_MMSYS is not set
-# CONFIG_COMMON_CLK_MT6797_IMGSYS is not set
-# CONFIG_COMMON_CLK_MT6797_VDECSYS is not set
-# CONFIG_COMMON_CLK_MT6797_VENCSYS is not set
+CONFIG_COMMON_CLK_MT6797_MMSYS=y
+CONFIG_COMMON_CLK_MT6797_IMGSYS=y
+CONFIG_COMMON_CLK_MT6797_VDECSYS=y
+CONFIG_COMMON_CLK_MT6797_VENCSYS=y
 CONFIG_COMMON_CLK_MT7622=y
 CONFIG_COMMON_CLK_MT7622_ETHSYS=y
 CONFIG_COMMON_CLK_MT7622_HIFSYS=y
 CONFIG_COMMON_CLK_MT7622_AUDSYS=y
 CONFIG_COMMON_CLK_MT8173=y
 CONFIG_COMMON_CLK_MT8183=y
-# CONFIG_COMMON_CLK_MT8183_AUDIOSYS is not set
-# CONFIG_COMMON_CLK_MT8183_CAMSYS is not set
-# CONFIG_COMMON_CLK_MT8183_IMGSYS is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_CORE0 is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_CORE1 is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_ADL is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_CONN is not set
-# CONFIG_COMMON_CLK_MT8183_MFGCFG is not set
-# CONFIG_COMMON_CLK_MT8183_MMSYS is not set
-# CONFIG_COMMON_CLK_MT8183_VDECSYS is not set
-# CONFIG_COMMON_CLK_MT8183_VENCSYS is not set
+CONFIG_COMMON_CLK_MT8183_AUDIOSYS=y
+CONFIG_COMMON_CLK_MT8183_CAMSYS=y
+CONFIG_COMMON_CLK_MT8183_IMGSYS=y
+CONFIG_COMMON_CLK_MT8183_IPU_CORE0=y
+CONFIG_COMMON_CLK_MT8183_IPU_CORE1=y
+CONFIG_COMMON_CLK_MT8183_IPU_ADL=y
+CONFIG_COMMON_CLK_MT8183_IPU_CONN=y
+CONFIG_COMMON_CLK_MT8183_MFGCFG=y
+CONFIG_COMMON_CLK_MT8183_MMSYS=y
+CONFIG_COMMON_CLK_MT8183_VDECSYS=y
+CONFIG_COMMON_CLK_MT8183_VENCSYS=y
 CONFIG_COMMON_CLK_MT8516=y
-# CONFIG_COMMON_CLK_MT8516_AUDSYS is not set
+CONFIG_COMMON_CLK_MT8516_AUDSYS=y
 # end of Clock driver for MediaTek SoC
 
 CONFIG_COMMON_CLK_MESON_REGMAP=y
 CONFIG_COMMON_CLK_MESON_DUALDIV=y
 CONFIG_COMMON_CLK_MESON_MPLL=y
+CONFIG_COMMON_CLK_MESON_PHASE=m
 CONFIG_COMMON_CLK_MESON_PLL=y
+CONFIG_COMMON_CLK_MESON_SCLK_DIV=m
 CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y
 CONFIG_COMMON_CLK_MESON_AO_CLKC=y
 CONFIG_COMMON_CLK_MESON_EE_CLKC=y
 CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y
 CONFIG_COMMON_CLK_GXBB=y
 CONFIG_COMMON_CLK_AXG=y
-# CONFIG_COMMON_CLK_AXG_AUDIO is not set
+CONFIG_COMMON_CLK_AXG_AUDIO=m
 CONFIG_COMMON_CLK_G12A=y
 CONFIG_ARMADA_AP_CP_HELPER=y
 CONFIG_ARMADA_37XX_CLK=y
@@ -7959,69 +8679,60 @@ CONFIG_ARMADA_AP806_SYSCON=y
 CONFIG_ARMADA_CP110_SYSCON=y
 CONFIG_QCOM_GDSC=y
 CONFIG_QCOM_RPMCC=y
-CONFIG_COMMON_CLK_QCOM=y
-CONFIG_QCOM_A53PLL=y
+CONFIG_COMMON_CLK_QCOM=m
+CONFIG_QCOM_A53PLL=m
+CONFIG_QCOM_CLK_APCS_MSM8916=m
 CONFIG_QCOM_CLK_RPM=m
 CONFIG_QCOM_CLK_SMD_RPM=m
+CONFIG_QCOM_CLK_RPMH=m
 # CONFIG_APQ_GCC_8084 is not set
 # CONFIG_APQ_MMCC_8084 is not set
 # CONFIG_IPQ_GCC_4019 is not set
-# CONFIG_IPQ_GCC_6018 is not set
+CONFIG_IPQ_GCC_6018=m
 # CONFIG_IPQ_GCC_806X is not set
 # CONFIG_IPQ_LCC_806X is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_MSM_GCC_8660 is not set
-CONFIG_MSM_GCC_8916=y
-CONFIG_MSM_GCC_8960=y
-CONFIG_MSM_LCC_8960=y
+CONFIG_MSM_GCC_8916=m
+# CONFIG_MSM_GCC_8960 is not set
+# CONFIG_MSM_LCC_8960 is not set
 # CONFIG_MDM_GCC_9615 is not set
 # CONFIG_MDM_LCC_9615 is not set
 # CONFIG_MSM_MMCC_8960 is not set
 # CONFIG_MSM_GCC_8974 is not set
 # CONFIG_MSM_MMCC_8974 is not set
-CONFIG_MSM_GCC_8994=m
-CONFIG_MSM_GCC_8996=y
-CONFIG_MSM_MMCC_8996=y
-# CONFIG_MSM_GCC_8998 is not set
-# CONFIG_MSM_GPUCC_8998 is not set
-# CONFIG_MSM_MMCC_8998 is not set
+# CONFIG_MSM_GCC_8994 is not set
+# CONFIG_MSM_GCC_8996 is not set
+# CONFIG_MSM_MMCC_8996 is not set
+CONFIG_MSM_GCC_8998=m
+CONFIG_MSM_GPUCC_8998=m
+CONFIG_MSM_MMCC_8998=m
 CONFIG_QCS_GCC_404=m
-# CONFIG_SC_DISPCC_7180 is not set
-# CONFIG_SC_GCC_7180 is not set
-# CONFIG_SC_GPUCC_7180 is not set
-# CONFIG_SC_MSS_7180 is not set
-# CONFIG_SC_VIDEOCC_7180 is not set
+CONFIG_SC_DISPCC_7180=m
+CONFIG_SC_GCC_7180=m
+CONFIG_SC_GPUCC_7180=m
+CONFIG_SC_MSS_7180=m
+CONFIG_SC_VIDEOCC_7180=m
 CONFIG_SDM_CAMCC_845=m
-CONFIG_SDM_GCC_660=m
-# CONFIG_QCS_TURING_404 is not set
-# CONFIG_QCS_Q6SSTOP_404 is not set
+# CONFIG_SDM_GCC_660 is not set
+CONFIG_QCS_TURING_404=m
+CONFIG_QCS_Q6SSTOP_404=m
 CONFIG_SDM_GCC_845=m
 CONFIG_SDM_GPUCC_845=m
-# CONFIG_SDM_VIDEOCC_845 is not set
-# CONFIG_SDM_DISPCC_845 is not set
+CONFIG_SDM_VIDEOCC_845=m
+CONFIG_SDM_DISPCC_845=m
 CONFIG_SDM_LPASSCC_845=m
 CONFIG_SM_GCC_8150=m
 CONFIG_SM_GCC_8250=m
-# CONFIG_SPMI_PMIC_CLKDIV is not set
+CONFIG_SPMI_PMIC_CLKDIV=m
 CONFIG_QCOM_HFPLL=m
-CONFIG_KPSS_XCC=m
-CONFIG_CLK_RENESAS=y
-CONFIG_CLK_R8A774A1=y
-CONFIG_CLK_R8A774C0=y
-CONFIG_CLK_R8A7795=y
-CONFIG_CLK_R8A77970=y
-CONFIG_CLK_R8A77995=y
-# CONFIG_CLK_R9A06G032 is not set
-CONFIG_CLK_RCAR_GEN3_CPG=y
-# CONFIG_CLK_RCAR_USB2_CLOCK_SEL is not set
-CONFIG_CLK_RENESAS_CPG_MSSR=y
-CONFIG_CLK_RENESAS_DIV6=y
+# CONFIG_KPSS_XCC is not set
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_ARM64_COMMON_CLK=y
-CONFIG_EXYNOS_AUDSS_CLK_CON=y
-CONFIG_SPRD_COMMON_CLK=y
-CONFIG_SPRD_SC9860_CLK=y
-CONFIG_SPRD_SC9863A_CLK=y
+CONFIG_EXYNOS_AUDSS_CLK_CON=m
+CONFIG_SPRD_COMMON_CLK=m
+CONFIG_SPRD_SC9860_CLK=m
+CONFIG_SPRD_SC9863A_CLK=m
 CONFIG_CLK_SUNXI=y
 CONFIG_CLK_SUNXI_CLOCKS=y
 CONFIG_CLK_SUNXI_PRCM_SUN6I=y
@@ -8032,18 +8743,17 @@ CONFIG_SUN50I_A64_CCU=y
 CONFIG_SUN50I_H6_CCU=y
 CONFIG_SUN50I_H6_R_CCU=y
 # CONFIG_SUN8I_A83T_CCU is not set
-# CONFIG_SUN8I_H3_CCU is not set
-# CONFIG_SUN8I_DE2_CCU is not set
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_DE2_CCU=y
 CONFIG_SUN8I_R_CCU=y
 CONFIG_CLK_TEGRA_BPMP=y
 CONFIG_TEGRA_CLK_DFLL=y
-CONFIG_CLK_UNIPHIER=y
-# CONFIG_COMMON_CLK_ZYNQMP is not set
+CONFIG_COMMON_CLK_ZYNQMP=y
 # end of Common Clock Framework
 
 CONFIG_HWSPINLOCK=y
-CONFIG_HWSPINLOCK_QCOM=y
-# CONFIG_HWSPINLOCK_SPRD is not set
+CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_HWSPINLOCK_SPRD=m
 
 #
 # Clock Source drivers
@@ -8063,34 +8773,30 @@ CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
 CONFIG_ARM_TIMER_SP804=y
-CONFIG_SYS_SUPPORTS_SH_CMT=y
 CONFIG_MTK_TIMER=y
 CONFIG_SPRD_TIMER=y
-CONFIG_SYS_SUPPORTS_SH_TMU=y
-CONFIG_SH_TIMER_CMT=y
-CONFIG_SH_TIMER_TMU=y
 CONFIG_CLKSRC_VERSATILE=y
 CONFIG_TIMER_IMX_SYS_CTR=y
 # CONFIG_MICROCHIP_PIT64B is not set
 # end of Clock Source drivers
 
 CONFIG_MAILBOX=y
-CONFIG_ARM_MHU=y
+# CONFIG_ARM_MHU is not set
 CONFIG_IMX_MBOX=m
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
 # CONFIG_PL320_MBOX is not set
 CONFIG_ARMADA_37XX_RWTM_MBOX=m
-# CONFIG_ROCKCHIP_MBOX is not set
+CONFIG_ROCKCHIP_MBOX=y
 CONFIG_PCC=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_BCM2835_MBOX=y
-# CONFIG_HI3660_MBOX is not set
-CONFIG_HI6220_MBOX=y
+CONFIG_HI3660_MBOX=m
+CONFIG_HI6220_MBOX=m
 # CONFIG_MAILBOX_TEST is not set
-# CONFIG_QCOM_APCS_IPC is not set
+CONFIG_QCOM_APCS_IPC=m
 CONFIG_TEGRA_HSP_MBOX=y
-# CONFIG_XGENE_SLIMPRO_MBOX is not set
-# CONFIG_BCM_PDC_MBOX is not set
+CONFIG_XGENE_SLIMPRO_MBOX=m
+CONFIG_BCM_PDC_MBOX=m
 CONFIG_BCM_FLEXRM_MBOX=m
 CONFIG_MTK_CMDQ_MBOX=m
 CONFIG_ZYNQMP_IPI_MBOX=y
@@ -8110,36 +8816,36 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # end of Generic IOMMU Pagetable Support
 
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
-# CONFIG_ROCKCHIP_IOMMU is not set
-# CONFIG_TEGRA_IOMMU_SMMU is not set
-# CONFIG_EXYNOS_IOMMU is not set
-# CONFIG_IPMMU_VMSA is not set
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_EXYNOS_IOMMU=y
+# CONFIG_EXYNOS_IOMMU_DEBUG is not set
 CONFIG_ARM_SMMU=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
-CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
+# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set
 CONFIG_ARM_SMMU_V3=y
 CONFIG_MTK_IOMMU=y
 CONFIG_QCOM_IOMMU=y
-# CONFIG_VIRTIO_IOMMU is not set
+CONFIG_VIRTIO_IOMMU=y
 
 #
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=y
-# CONFIG_IMX_REMOTEPROC is not set
+CONFIG_IMX_REMOTEPROC=m
 CONFIG_MTK_SCP=m
 CONFIG_QCOM_RPROC_COMMON=m
 CONFIG_QCOM_Q6V5_COMMON=m
 CONFIG_QCOM_Q6V5_ADSP=m
 CONFIG_QCOM_Q6V5_MSS=m
 CONFIG_QCOM_Q6V5_PAS=m
-# CONFIG_QCOM_Q6V5_WCSS is not set
+CONFIG_QCOM_Q6V5_WCSS=m
 CONFIG_QCOM_Q6V5_IPA_NOTIFY=m
-# CONFIG_QCOM_SYSMON is not set
-CONFIG_QCOM_WCNSS_PIL=m
+CONFIG_QCOM_SYSMON=m
+# CONFIG_QCOM_WCNSS_PIL is not set
 # end of Remoteproc drivers
 
 #
@@ -8149,18 +8855,24 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 CONFIG_RPMSG_MTK_SCP=m
 CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
 CONFIG_RPMSG_QCOM_GLINK_SMEM=m
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPMSG_VIRTIO=m
 # end of Rpmsg drivers
 
-# CONFIG_SOUNDWIRE is not set
+CONFIG_SOUNDWIRE=y
+
+#
+# SoundWire Devices
+#
+# CONFIG_SOUNDWIRE_INTEL is not set
 
 #
 # SOC (System On Chip) specific Drivers
 #
-# CONFIG_OWL_PM_DOMAINS is not set
+CONFIG_OWL_PM_DOMAINS_HELPER=y
+CONFIG_OWL_PM_DOMAINS=y
 
 #
 # Amlogic SoC drivers
@@ -8170,7 +8882,8 @@ CONFIG_MESON_CLK_MEASURE=y
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_GX_PM_DOMAINS=y
 CONFIG_MESON_EE_PM_DOMAINS=y
-CONFIG_MESON_MX_SOCINFO=y
+CONFIG_MESON_SECURE_PM_DOMAINS=y
+# CONFIG_MESON_MX_SOCINFO is not set
 # end of Amlogic SoC drivers
 
 #
@@ -8194,16 +8907,18 @@ CONFIG_FSL_DPAA=y
 # CONFIG_FSL_DPAA_CHECKING is not set
 # CONFIG_FSL_BMAN_TEST is not set
 # CONFIG_FSL_QMAN_TEST is not set
-# CONFIG_QUICC_ENGINE is not set
-CONFIG_DPAA2_CONSOLE=y
-# CONFIG_FSL_RCPM is not set
+CONFIG_QUICC_ENGINE=y
+CONFIG_FSL_GUTS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_DPAA2_CONSOLE=m
+CONFIG_FSL_RCPM=y
 # end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
-# CONFIG_IMX_SCU_SOC is not set
+CONFIG_IMX_SCU_SOC=y
 CONFIG_SOC_IMX8M=y
 # end of i.MX SoC drivers
 
@@ -8212,55 +8927,36 @@ CONFIG_SOC_IMX8M=y
 #
 CONFIG_MTK_CMDQ=m
 CONFIG_MTK_INFRACFG=y
-CONFIG_MTK_PMIC_WRAP=y
+CONFIG_MTK_PMIC_WRAP=m
 CONFIG_MTK_SCPSYS=y
 # end of MediaTek SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
-# CONFIG_QCOM_AOSS_QMP is not set
+CONFIG_QCOM_AOSS_QMP=m
 CONFIG_QCOM_COMMAND_DB=y
-# CONFIG_QCOM_GENI_SE is not set
+CONFIG_QCOM_GENI_SE=y
 CONFIG_QCOM_GLINK_SSR=m
-CONFIG_QCOM_GSBI=y
-# CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_MDT_LOADER=m
-# CONFIG_QCOM_OCMEM is not set
+CONFIG_QCOM_OCMEM=m
+CONFIG_QCOM_PDR_HELPERS=m
 CONFIG_QCOM_QMI_HELPERS=m
 CONFIG_QCOM_RMTFS_MEM=m
-# CONFIG_QCOM_RPMH is not set
-CONFIG_QCOM_SMEM=y
+CONFIG_QCOM_RPMH=y
+CONFIG_QCOM_RPMHPD=y
+CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_SMEM_STATE=y
-CONFIG_QCOM_SMP2P=y
-CONFIG_QCOM_SMSM=y
+CONFIG_QCOM_SMP2P=m
+CONFIG_QCOM_SMSM=m
 CONFIG_QCOM_SOCINFO=m
 CONFIG_QCOM_WCNSS_CTRL=m
-# CONFIG_QCOM_APR is not set
+CONFIG_QCOM_APR=m
 # end of Qualcomm SoC drivers
 
-CONFIG_SOC_RENESAS=y
-CONFIG_ARCH_RCAR_GEN3=y
-CONFIG_ARCH_R8A774A1=y
-# CONFIG_ARCH_R8A774B1 is not set
-CONFIG_ARCH_R8A774C0=y
-CONFIG_ARCH_R8A77950=y
-CONFIG_ARCH_R8A77951=y
-# CONFIG_ARCH_R8A77960 is not set
-# CONFIG_ARCH_R8A77961 is not set
-# CONFIG_ARCH_R8A77965 is not set
-CONFIG_ARCH_R8A77970=y
-# CONFIG_ARCH_R8A77980 is not set
-# CONFIG_ARCH_R8A77990 is not set
-CONFIG_ARCH_R8A77995=y
-CONFIG_SYSC_R8A774A1=y
-CONFIG_SYSC_R8A774C0=y
-CONFIG_SYSC_R8A7795=y
-CONFIG_SYSC_R8A77970=y
-CONFIG_SYSC_R8A77995=y
-CONFIG_RST_RCAR=y
-CONFIG_SYSC_RCAR=y
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
@@ -8271,22 +8967,23 @@ CONFIG_SUNXI_SRAM=y
 CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 CONFIG_ARCH_TEGRA_186_SOC=y
-# CONFIG_ARCH_TEGRA_194_SOC is not set
+CONFIG_ARCH_TEGRA_194_SOC=y
 CONFIG_SOC_TEGRA_FUSE=y
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 CONFIG_SOC_TEGRA_PMC=y
 CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
 
 #
 # Xilinx SoC drivers
 #
-# CONFIG_XILINX_VCU is not set
+CONFIG_XILINX_VCU=m
 CONFIG_ZYNQMP_POWER=y
 CONFIG_ZYNQMP_PM_DOMAINS=y
 # end of Xilinx SoC drivers
 
-# CONFIG_SOC_ZTE is not set
+CONFIG_SOC_ZTE=y
+CONFIG_ZX2967_PM_DOMAINS=y
 # end of SOC (System On Chip) specific Drivers
 
 CONFIG_PM_DEVFREQ=y
@@ -8294,46 +8991,49 @@ CONFIG_PM_DEVFREQ=y
 #
 # DEVFREQ Governors
 #
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
-# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=m
+CONFIG_DEVFREQ_GOV_POWERSAVE=m
 CONFIG_DEVFREQ_GOV_USERSPACE=m
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+CONFIG_DEVFREQ_GOV_PASSIVE=y
 
 #
 # DEVFREQ Drivers
 #
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
 CONFIG_ARM_TEGRA_DEVFREQ=m
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
-# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=y
+CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
 CONFIG_EXTCON=y
 
 #
 # Extcon Device Drivers
 #
-CONFIG_EXTCON_ADC_JACK=m
-# CONFIG_EXTCON_FSA9480 is not set
-CONFIG_EXTCON_GPIO=y
-# CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_ADC_JACK is not set
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_MAX3355=m
 CONFIG_EXTCON_PTN5150=m
-CONFIG_EXTCON_QCOM_SPMI_MISC=y
+CONFIG_EXTCON_QCOM_SPMI_MISC=m
 # CONFIG_EXTCON_RT8973A is not set
-# CONFIG_EXTCON_SM5502 is not set
-CONFIG_EXTCON_USB_GPIO=y
+CONFIG_EXTCON_SM5502=m
+# CONFIG_EXTCON_USB_GPIO is not set
 CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_MEMORY=y
-# CONFIG_ARM_PL172_MPMC is not set
+CONFIG_ARM_PL172_MPMC=m
 CONFIG_FSL_IFC=y
 CONFIG_MTK_SMI=y
 CONFIG_TEGRA_MC=y
-CONFIG_IIO=y
+CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
-CONFIG_IIO_BUFFER_CB=y
-# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
-CONFIG_IIO_KFIFO_BUF=y
-CONFIG_IIO_TRIGGERED_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_CONFIGFS=m
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
@@ -8344,15 +9044,12 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 #
 # Accelerometers
 #
-CONFIG_ADIS16201=m
-CONFIG_ADIS16209=m
-CONFIG_ADXL345=m
-CONFIG_ADXL345_I2C=m
-CONFIG_ADXL345_SPI=m
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
 CONFIG_ADXL372=m
 CONFIG_ADXL372_SPI=m
 CONFIG_ADXL372_I2C=m
-CONFIG_BMA180=m
+# CONFIG_BMA180 is not set
 CONFIG_BMA220=m
 CONFIG_BMA400=m
 CONFIG_BMA400_I2C=m
@@ -8366,25 +9063,21 @@ CONFIG_DMARD09=m
 CONFIG_DMARD10=m
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
-CONFIG_KXSD9=m
-CONFIG_KXSD9_SPI=m
-CONFIG_KXSD9_I2C=m
-CONFIG_KXCJK1013=m
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
 CONFIG_MC3230=m
 CONFIG_MMA7455=m
 CONFIG_MMA7455_I2C=m
 CONFIG_MMA7455_SPI=m
 CONFIG_MMA7660=m
-CONFIG_MMA8452=m
+# CONFIG_MMA8452 is not set
 CONFIG_MMA9551_CORE=m
 CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
 CONFIG_MXC6255=m
-CONFIG_SCA3000=m
+# CONFIG_SCA3000 is not set
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
 # end of Accelerometers
@@ -8395,84 +9088,89 @@ CONFIG_STK8BA50=m
 CONFIG_AD_SIGMA_DELTA=m
 CONFIG_AD7091R5=m
 CONFIG_AD7124=m
-CONFIG_AD7192=m
-CONFIG_AD7266=m
-CONFIG_AD7291=m
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
 CONFIG_AD7292=m
-CONFIG_AD7298=m
-CONFIG_AD7476=m
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
 CONFIG_AD7606=m
 CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
-CONFIG_AD7780=m
-CONFIG_AD7791=m
-CONFIG_AD7793=m
-CONFIG_AD7887=m
-CONFIG_AD7923=m
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
 CONFIG_AD7949=m
-CONFIG_AD799X=m
-# CONFIG_BCM_IPROC_ADC is not set
+# CONFIG_AD799X is not set
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+CONFIG_BCM_IPROC_ADC=m
 # CONFIG_BERLIN2_ADC is not set
-CONFIG_CC10001_ADC=m
+# CONFIG_CC10001_ADC is not set
+CONFIG_CPCAP_ADC=m
+CONFIG_DLN2_ADC=m
 CONFIG_ENVELOPE_DETECTOR=m
 # CONFIG_EXYNOS_ADC is not set
 CONFIG_HI8435=m
-# CONFIG_HX711 is not set
+CONFIG_HX711=m
 CONFIG_INA2XX_ADC=m
-CONFIG_IMX7D_ADC=m
+# CONFIG_IMX7D_ADC is not set
 CONFIG_LTC2471=m
 CONFIG_LTC2485=m
 CONFIG_LTC2496=m
 CONFIG_LTC2497=m
-CONFIG_MAX1027=m
-# CONFIG_MAX11100 is not set
+# CONFIG_MAX1027 is not set
+CONFIG_MAX11100=m
 CONFIG_MAX1118=m
-CONFIG_MAX1363=m
+# CONFIG_MAX1363 is not set
 CONFIG_MAX9611=m
-CONFIG_MCP320X=m
-CONFIG_MCP3422=m
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
 CONFIG_MCP3911=m
 CONFIG_MEDIATEK_MT6577_AUXADC=m
-CONFIG_MESON_SARADC=y
-CONFIG_NAU7802=m
-CONFIG_QCOM_VADC_COMMON=y
-CONFIG_QCOM_SPMI_IADC=y
-CONFIG_QCOM_SPMI_VADC=y
+CONFIG_MESON_SARADC=m
+# CONFIG_NAU7802 is not set
+CONFIG_QCOM_VADC_COMMON=m
+# CONFIG_QCOM_SPMI_IADC is not set
+# CONFIG_QCOM_SPMI_VADC is not set
 CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_ROCKCHIP_SARADC is not set
-# CONFIG_SC27XX_ADC is not set
-# CONFIG_SD_ADC_MODULATOR is not set
+CONFIG_SC27XX_ADC=m
+CONFIG_SD_ADC_MODULATOR=m
 CONFIG_SUN4I_GPADC=m
-CONFIG_TI_ADC081C=m
+# CONFIG_TI_ADC081C is not set
 CONFIG_TI_ADC0832=m
-# CONFIG_TI_ADC084S021 is not set
+CONFIG_TI_ADC084S021=m
 CONFIG_TI_ADC12138=m
-# CONFIG_TI_ADC108S102 is not set
-CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC108S102=m
+# CONFIG_TI_ADC128S052 is not set
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
-# CONFIG_TI_ADS7950 is not set
+CONFIG_TI_ADS7950=m
 CONFIG_TI_ADS8344=m
-CONFIG_TI_ADS8688=m
+# CONFIG_TI_ADS8688 is not set
 CONFIG_TI_ADS124S08=m
-# CONFIG_TI_TLC4541 is not set
-CONFIG_VF610_ADC=m
-CONFIG_VIPERBOARD_ADC=m
-# CONFIG_XILINX_XADC is not set
+# CONFIG_TI_AM335X_ADC is not set
+CONFIG_TI_TLC4541=m
+# CONFIG_VF610_ADC is not set
+# CONFIG_VIPERBOARD_ADC is not set
+CONFIG_XILINX_XADC=m
 # end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
-# CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE=m
 # end of Analog Front Ends
 
 #
 # Amplifiers
 #
-CONFIG_AD8366=m
+# CONFIG_AD8366 is not set
 CONFIG_HMC425=m
 # end of Amplifiers
 
@@ -8485,14 +9183,15 @@ CONFIG_BME680_I2C=m
 CONFIG_BME680_SPI=m
 CONFIG_CCS811=m
 CONFIG_IAQCORE=m
-CONFIG_SENSIRION_SGP30=m
+CONFIG_PMS7003=m
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
 # end of Chemical Sensors
 
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 CONFIG_IIO_CROS_EC_SENSORS=m
-# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
+CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
 
 #
 # Hid Sensor IIO Common
@@ -8516,41 +9215,42 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # Digital to analog converters
 #
-CONFIG_AD5064=m
-CONFIG_AD5360=m
-CONFIG_AD5380=m
-CONFIG_AD5421=m
-CONFIG_AD5446=m
-CONFIG_AD5449=m
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
 CONFIG_AD5592R_BASE=m
 CONFIG_AD5592R=m
-CONFIG_AD5593R=m
-CONFIG_AD5504=m
-CONFIG_AD5624R_SPI=m
-# CONFIG_AD5686_SPI is not set
-# CONFIG_AD5696_I2C is not set
-CONFIG_AD5755=m
-# CONFIG_AD5758 is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
+# CONFIG_AD5755 is not set
+CONFIG_AD5758=m
 CONFIG_AD5761=m
-CONFIG_AD5764=m
+# CONFIG_AD5764 is not set
 CONFIG_AD5770R=m
-CONFIG_AD5791=m
-CONFIG_AD7303=m
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
 CONFIG_AD8801=m
 CONFIG_DPOT_DAC=m
 CONFIG_DS4424=m
 CONFIG_LTC1660=m
 CONFIG_LTC2632=m
 CONFIG_M62332=m
-CONFIG_MAX517=m
-CONFIG_MAX5821=m
-CONFIG_MCP4725=m
-CONFIG_MCP4922=m
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
 CONFIG_TI_DAC082S085=m
-# CONFIG_TI_DAC5571 is not set
+CONFIG_TI_DAC5571=m
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
-CONFIG_VF610_DAC=m
+# CONFIG_VF610_DAC is not set
 # end of Digital to analog converters
 
 #
@@ -8566,37 +9266,34 @@ CONFIG_VF610_DAC=m
 #
 # Clock Generator/Distribution
 #
-CONFIG_AD9523=m
+# CONFIG_AD9523 is not set
 # end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
-CONFIG_ADF4350=m
-# CONFIG_ADF4371 is not set
+# CONFIG_ADF4350 is not set
+CONFIG_ADF4371=m
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
 #
-CONFIG_ADIS16080=m
-CONFIG_ADIS16130=m
-CONFIG_ADIS16136=m
-CONFIG_ADIS16260=m
-CONFIG_ADXRS450=m
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_BMG160_SPI=m
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
 CONFIG_FXAS21002C=m
 CONFIG_FXAS21002C_I2C=m
 CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
-# CONFIG_MPU3050_I2C is not set
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
-CONFIG_ITG3200=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
 # end of Digital gyroscope sensors
 
 #
@@ -8617,23 +9314,23 @@ CONFIG_MAX30102=m
 # Humidity sensors
 #
 CONFIG_AM2315=m
-CONFIG_DHT11=m
+# CONFIG_DHT11 is not set
 CONFIG_HDC100X=m
 CONFIG_HID_SENSOR_HUMIDITY=m
 CONFIG_HTS221=m
 CONFIG_HTS221_I2C=m
 CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
 # end of Humidity sensors
 
 #
 # Inertial measurement units
 #
-CONFIG_ADIS16400=m
-# CONFIG_ADIS16460 is not set
-CONFIG_ADIS16480=m
+# CONFIG_ADIS16400 is not set
+CONFIG_ADIS16460=m
+# CONFIG_ADIS16480 is not set
 CONFIG_BMI160=m
 CONFIG_BMI160_I2C=m
 CONFIG_BMI160_SPI=m
@@ -8644,7 +9341,10 @@ CONFIG_KMX61=m
 CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
 CONFIG_INV_MPU6050_SPI=m
-# CONFIG_IIO_ST_LSM6DSX is not set
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
+CONFIG_IIO_ST_LSM6DSX_I3C=m
 # end of Inertial measurement units
 
 CONFIG_IIO_ADIS_LIB=m
@@ -8653,75 +9353,74 @@ CONFIG_IIO_ADIS_LIB_BUFFER=y
 #
 # Light sensors
 #
-CONFIG_ACPI_ALS=m
-CONFIG_ADJD_S311=m
+# CONFIG_ACPI_ALS is not set
+# CONFIG_ADJD_S311 is not set
 CONFIG_ADUX1020=m
-# CONFIG_AL3010 is not set
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
+CONFIG_AL3010=m
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
 CONFIG_APDS9960=m
-CONFIG_BH1750=m
-CONFIG_BH1780=m
-CONFIG_CM32181=m
+# CONFIG_BH1750 is not set
+# CONFIG_BH1780 is not set
+# CONFIG_CM32181 is not set
 CONFIG_CM3232=m
 CONFIG_CM3323=m
-# CONFIG_CM3605 is not set
-CONFIG_CM36651=m
+CONFIG_CM3605=m
+# CONFIG_CM36651 is not set
 CONFIG_IIO_CROS_EC_LIGHT_PROX=m
-# CONFIG_GP2AP002 is not set
-CONFIG_GP2AP020A00F=m
-# CONFIG_IQS621_ALS is not set
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_ISL29125=m
+CONFIG_GP2AP002=m
+# CONFIG_GP2AP020A00F is not set
+CONFIG_IQS621_ALS=m
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_PROX=m
 CONFIG_JSA1212=m
 CONFIG_RPR0521=m
-CONFIG_LTR501=m
-# CONFIG_LV0104CS is not set
-CONFIG_MAX44000=m
+# CONFIG_SENSORS_LM3533 is not set
+# CONFIG_LTR501 is not set
+CONFIG_LV0104CS=m
+# CONFIG_MAX44000 is not set
 CONFIG_MAX44009=m
 CONFIG_NOA1305=m
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
-# CONFIG_SI1133 is not set
+CONFIG_SI1133=m
 CONFIG_SI1145=m
-CONFIG_STK3310=m
-# CONFIG_ST_UVIS25 is not set
-CONFIG_TCS3414=m
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL2583=m
-# CONFIG_TSL2772 is not set
-CONFIG_TSL4531=m
+# CONFIG_STK3310 is not set
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+CONFIG_TSL2772=m
+# CONFIG_TSL4531 is not set
 CONFIG_US5182D=m
-CONFIG_VCNL4000=m
+# CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VEML6030=m
-CONFIG_VEML6070=m
+# CONFIG_VEML6070 is not set
 CONFIG_VL6180=m
-# CONFIG_ZOPT2201 is not set
+CONFIG_ZOPT2201=m
 # end of Light sensors
 
 #
 # Magnetometer sensors
 #
 CONFIG_AK8974=m
-CONFIG_AK8975=m
-CONFIG_AK09911=m
-CONFIG_BMC150_MAGN=m
-CONFIG_BMC150_MAGN_I2C=m
-CONFIG_BMC150_MAGN_SPI=m
-CONFIG_MAG3110=m
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-CONFIG_SENSORS_HMC5843_SPI=m
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
@@ -8730,7 +9429,7 @@ CONFIG_SENSORS_RM3100_SPI=m
 #
 # Multiplexers
 #
-# CONFIG_IIO_MUX is not set
+CONFIG_IIO_MUX=m
 # end of Multiplexers
 
 #
@@ -8744,27 +9443,27 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # Triggers - standalone
 #
 CONFIG_IIO_HRTIMER_TRIGGER=m
-CONFIG_IIO_INTERRUPT_TRIGGER=m
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
+# CONFIG_IIO_SYSFS_TRIGGER is not set
 # end of Triggers - standalone
 
 #
 # Linear and angular position sensors
 #
-# CONFIG_IQS624_POS is not set
+CONFIG_IQS624_POS=m
 # end of Linear and angular position sensors
 
 #
 # Digital potentiometers
 #
-# CONFIG_AD5272 is not set
-CONFIG_DS1803=m
+CONFIG_AD5272=m
+# CONFIG_DS1803 is not set
 CONFIG_MAX5432=m
-# CONFIG_MAX5481 is not set
+CONFIG_MAX5481=m
 CONFIG_MAX5487=m
-# CONFIG_MCP4018 is not set
-CONFIG_MCP4131=m
+CONFIG_MCP4018=m
+# CONFIG_MCP4131 is not set
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
@@ -8783,25 +9482,23 @@ CONFIG_ABP060MG=m
 CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
-# CONFIG_IIO_CROS_EC_BARO is not set
+CONFIG_IIO_CROS_EC_BARO=m
 CONFIG_DLHL60D=m
-# CONFIG_DPS310 is not set
+CONFIG_DPS310=m
 CONFIG_HID_SENSOR_PRESS=m
-CONFIG_HP03=m
-# CONFIG_ICP10100 is not set
+# CONFIG_HP03 is not set
+CONFIG_ICP10100=m
 CONFIG_MPL115=m
 CONFIG_MPL115_I2C=m
 CONFIG_MPL115_SPI=m
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5611_SPI=m
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
 CONFIG_MS5637=m
 CONFIG_IIO_ST_PRESS=m
 CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
-CONFIG_T5403=m
-CONFIG_HP206C=m
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
@@ -8810,72 +9507,80 @@ CONFIG_ZPA2326_SPI=m
 #
 # Lightning sensors
 #
-CONFIG_AS3935=m
+# CONFIG_AS3935 is not set
 # end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
-# CONFIG_ISL29501 is not set
+CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
 CONFIG_MB1232=m
-# CONFIG_PING is not set
+CONFIG_PING=m
 CONFIG_RFD77402=m
 CONFIG_SRF04=m
 CONFIG_SX9500=m
-# CONFIG_SRF08 is not set
+CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
 # end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
-CONFIG_AD2S90=m
-CONFIG_AD2S1200=m
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
 # end of Resolver to digital converters
 
 #
 # Temperature sensors
 #
-# CONFIG_IQS620AT_TEMP is not set
-# CONFIG_LTC2983 is not set
+CONFIG_IQS620AT_TEMP=m
+CONFIG_LTC2983=m
 CONFIG_MAXIM_THERMOCOUPLE=m
 CONFIG_HID_SENSOR_TEMP=m
-CONFIG_MLX90614=m
-# CONFIG_MLX90632 is not set
-CONFIG_TMP006=m
-# CONFIG_TMP007 is not set
+# CONFIG_MLX90614 is not set
+CONFIG_MLX90632=m
+# CONFIG_TMP006 is not set
+CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
 CONFIG_MAX31856=m
 # end of Temperature sensors
 
-# CONFIG_NTB is not set
+CONFIG_NTB=y
+CONFIG_NTB_MSI=y
+CONFIG_NTB_IDT=m
+CONFIG_NTB_SWITCHTEC=m
+# CONFIG_NTB_PINGPONG is not set
+# CONFIG_NTB_TOOL is not set
+CONFIG_NTB_PERF=m
+# CONFIG_NTB_MSI_TEST is not set
+CONFIG_NTB_TRANSPORT=m
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_DEBUG is not set
-CONFIG_PWM_BCM_IPROC=y
+CONFIG_PWM_ATMEL_HLCDC_PWM=m
+CONFIG_PWM_BCM_IPROC=m
 CONFIG_PWM_BCM2835=m
-# CONFIG_PWM_BERLIN is not set
-# CONFIG_PWM_BRCMSTB is not set
+CONFIG_PWM_BERLIN=m
+CONFIG_PWM_BRCMSTB=m
 CONFIG_PWM_CROS_EC=m
 # CONFIG_PWM_FSL_FTM is not set
 CONFIG_PWM_HIBVT=m
-CONFIG_PWM_IMX1=m
-CONFIG_PWM_IMX27=m
+# CONFIG_PWM_IMX1 is not set
+# CONFIG_PWM_IMX27 is not set
 CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_LP3943=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_MTK_DISP=m
 CONFIG_PWM_MEDIATEK=m
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_RCAR is not set
-# CONFIG_PWM_RENESAS_TPU is not set
-# CONFIG_PWM_ROCKCHIP is not set
-# CONFIG_PWM_SAMSUNG is not set
+CONFIG_PWM_ROCKCHIP=m
+CONFIG_PWM_SAMSUNG=m
 CONFIG_PWM_SPRD=m
 CONFIG_PWM_SUN4I=m
-# CONFIG_PWM_TEGRA is not set
+CONFIG_PWM_TEGRA=m
 CONFIG_PWM_ZX=m
 
 #
@@ -8889,14 +9594,14 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_ARM_GIC_V3_ITS_FSL_MC=y
 CONFIG_ALPINE_MSI=y
-# CONFIG_AL_FIC is not set
+CONFIG_AL_FIC=y
 CONFIG_BCM7038_L1_IRQ=y
 CONFIG_BRCMSTB_L2_IRQ=y
 CONFIG_DW_APB_ICTL=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
 CONFIG_MADERA_IRQ=m
-CONFIG_RENESAS_IRQC=y
 CONFIG_IMX_GPCV2=y
 CONFIG_MVEBU_GICP=y
 CONFIG_MVEBU_ICU=y
@@ -8906,33 +9611,33 @@ CONFIG_MVEBU_SEI=y
 CONFIG_LS_EXTIRQ=y
 CONFIG_LS_SCFG_MSI=y
 CONFIG_PARTITION_PERCPU=y
-# CONFIG_QCOM_IRQ_COMBINER is not set
-CONFIG_IRQ_UNIPHIER_AIDET=y
+CONFIG_QCOM_IRQ_COMBINER=y
 CONFIG_MESON_IRQ_GPIO=y
-# CONFIG_QCOM_PDC is not set
+CONFIG_QCOM_PDC=y
 CONFIG_IMX_IRQSTEER=y
 CONFIG_IMX_INTMUX=y
 # end of IRQ chip support
 
-# CONFIG_IPACK_BUS is not set
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_BERLIN=y
-CONFIG_RESET_BRCMSTB=y
+CONFIG_RESET_BRCMSTB=m
 CONFIG_RESET_BRCMSTB_RESCAL=y
 CONFIG_RESET_IMX7=y
 # CONFIG_RESET_INTEL_GW is not set
 CONFIG_RESET_MESON=y
-# CONFIG_RESET_MESON_AUDIO_ARB is not set
-# CONFIG_RESET_QCOM_AOSS is not set
+CONFIG_RESET_MESON_AUDIO_ARB=m
+CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_QCOM_PDC=m
+CONFIG_RESET_SCMI=m
 CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_SUNXI=y
-# CONFIG_RESET_TI_SYSCON is not set
-CONFIG_RESET_UNIPHIER=y
-CONFIG_RESET_UNIPHIER_GLUE=y
-CONFIG_COMMON_RESET_HI3660=y
-CONFIG_COMMON_RESET_HI6220=y
+CONFIG_RESET_TI_SYSCON=m
+CONFIG_COMMON_RESET_HI3660=m
+CONFIG_COMMON_RESET_HI6220=m
 CONFIG_RESET_TEGRA_BPMP=y
 
 #
@@ -8940,82 +9645,76 @@ CONFIG_RESET_TEGRA_BPMP=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_PHY_XGENE=y
-# CONFIG_PHY_SUN4I_USB is not set
+CONFIG_PHY_XGENE=m
+CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
-# CONFIG_PHY_SUN9I_USB is not set
-# CONFIG_PHY_SUN50I_USB3 is not set
-CONFIG_PHY_MESON8B_USB2=y
-CONFIG_PHY_MESON_GXL_USB2=y
-CONFIG_PHY_MESON_GXL_USB3=y
+CONFIG_PHY_SUN9I_USB=m
+CONFIG_PHY_SUN50I_USB3=m
+CONFIG_PHY_MESON8B_USB2=m
+CONFIG_PHY_MESON_GXL_USB2=m
+CONFIG_PHY_MESON_GXL_USB3=m
 CONFIG_PHY_MESON_G12A_USB2=m
-CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
 CONFIG_PHY_MESON_AXG_PCIE=m
 CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG=m
-CONFIG_PHY_BCM_SR_USB=y
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_BCM_NS_USB2 is not set
-# CONFIG_PHY_BCM_NS_USB3 is not set
-CONFIG_PHY_NS2_PCIE=y
-CONFIG_PHY_NS2_USB_DRD=y
-CONFIG_PHY_BRCM_SATA=y
+CONFIG_PHY_BCM_SR_USB=m
+CONFIG_BCM_KONA_USB2_PHY=m
+CONFIG_PHY_BCM_NS_USB2=m
+CONFIG_PHY_BCM_NS_USB3=m
+CONFIG_PHY_NS2_PCIE=m
+CONFIG_PHY_NS2_USB_DRD=m
+CONFIG_PHY_BRCM_SATA=m
 CONFIG_PHY_BRCM_USB=m
-CONFIG_PHY_BCM_SR_PCIE=y
+CONFIG_PHY_BCM_SR_PCIE=m
 CONFIG_PHY_CADENCE_TORRENT=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-CONFIG_PHY_HI6220_USB=y
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
+CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_HI3660_USB=m
-# CONFIG_PHY_HISTB_COMBPHY is not set
-# CONFIG_PHY_HISI_INNO_USB2 is not set
-# CONFIG_PHY_BERLIN_SATA is not set
-# CONFIG_PHY_BERLIN_USB is not set
+CONFIG_PHY_HISTB_COMBPHY=m
+CONFIG_PHY_HISI_INNO_USB2=m
+CONFIG_PHY_BERLIN_SATA=m
+CONFIG_PHY_BERLIN_USB=m
 CONFIG_PHY_MVEBU_A3700_COMPHY=m
-CONFIG_PHY_MVEBU_A3700_UTMI=y
+CONFIG_PHY_MVEBU_A3700_UTMI=m
 CONFIG_PHY_MVEBU_A38X_COMPHY=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
 CONFIG_PHY_MTK_TPHY=m
 CONFIG_PHY_MTK_UFS=m
-# CONFIG_PHY_MTK_XSPHY is not set
-# CONFIG_PHY_CPCAP_USB is not set
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+CONFIG_PHY_MTK_XSPHY=m
+CONFIG_PHY_CPCAP_USB=m
+CONFIG_PHY_MAPPHONE_MDM6600=m
 CONFIG_PHY_OCELOT_SERDES=m
-# CONFIG_PHY_QCOM_APQ8064_SATA is not set
-# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_PHY_QCOM_PCIE2=m
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
-CONFIG_PHY_QCOM_UFS=y
-CONFIG_PHY_QCOM_UFS_14NM=y
-# CONFIG_PHY_QCOM_USB_HS is not set
-# CONFIG_PHY_QCOM_USB_HSIC is not set
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_14NM=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS_28NM=m
 CONFIG_PHY_QCOM_USB_SS=m
-# CONFIG_PHY_RCAR_GEN2 is not set
-# CONFIG_PHY_RCAR_GEN3_PCIE is not set
-# CONFIG_PHY_RCAR_GEN3_USB2 is not set
-# CONFIG_PHY_RCAR_GEN3_USB3 is not set
-# CONFIG_PHY_ROCKCHIP_DP is not set
-CONFIG_PHY_ROCKCHIP_EMMC=y
+CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
-# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set
-# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set
+CONFIG_PHY_ROCKCHIP_INNO_USB2=m
+CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
-# CONFIG_PHY_ROCKCHIP_TYPEC is not set
+CONFIG_PHY_ROCKCHIP_TYPEC=m
 CONFIG_PHY_ROCKCHIP_USB=m
-CONFIG_PHY_EXYNOS_DP_VIDEO=y
-CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
-# CONFIG_PHY_EXYNOS_PCIE is not set
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_PHY_EXYNOS_PCIE=y
 # CONFIG_PHY_SAMSUNG_USB2 is not set
-CONFIG_PHY_EXYNOS5_USBDRD=y
-CONFIG_PHY_UNIPHIER_USB2=m
-CONFIG_PHY_UNIPHIER_USB3=m
-CONFIG_PHY_UNIPHIER_PCIE=m
-# CONFIG_PHY_TEGRA_XUSB is not set
+# CONFIG_PHY_EXYNOS5_USBDRD is not set
+CONFIG_PHY_TEGRA_XUSB=m
+CONFIG_PHY_TEGRA194_P2U=m
 # CONFIG_PHY_TUSB1210 is not set
 # CONFIG_PHY_INTEL_EMMC is not set
 # end of PHY Subsystem
@@ -9029,17 +9728,18 @@ CONFIG_IDLE_INJECT=y
 #
 CONFIG_ARM_CCI_PMU=y
 CONFIG_ARM_CCI400_PMU=y
-# CONFIG_ARM_CCI5xx_PMU is not set
+CONFIG_ARM_CCI5xx_PMU=y
 CONFIG_ARM_CCN=y
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
 CONFIG_ARM_SMMU_V3_PMU=m
-# CONFIG_ARM_DSU_PMU is not set
-# CONFIG_FSL_IMX8_DDR_PMU is not set
+CONFIG_ARM_DSU_PMU=m
+CONFIG_FSL_IMX8_DDR_PMU=m
 CONFIG_HISI_PMU=y
-# CONFIG_QCOM_L2_PMU is not set
-# CONFIG_QCOM_L3_PMU is not set
-# CONFIG_XGENE_PMU is not set
+CONFIG_QCOM_L2_PMU=y
+CONFIG_QCOM_L3_PMU=y
+CONFIG_THUNDERX2_PMU=m
+CONFIG_XGENE_PMU=y
 CONFIG_ARM_SPE_PMU=m
 # end of Performance monitor support
 
@@ -9051,45 +9751,87 @@ CONFIG_RAS=y
 # CONFIG_ANDROID is not set
 # end of Android
 
-CONFIG_LIBNVDIMM=y
+CONFIG_LIBNVDIMM=m
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
 CONFIG_ND_CLAIM=y
 CONFIG_ND_BTT=m
 CONFIG_BTT=y
-CONFIG_OF_PMEM=y
+CONFIG_ND_PFN=m
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
+CONFIG_OF_PMEM=m
 CONFIG_NVDIMM_KEYS=y
 CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_HMEM=m
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+CONFIG_NVMEM_IMX_OCOTP_SCU=m
 CONFIG_MTK_EFUSE=m
 CONFIG_QCOM_QFPROM=m
-# CONFIG_NVMEM_SPMI_SDAM is not set
-# CONFIG_ROCKCHIP_EFUSE is not set
+CONFIG_NVMEM_SPMI_SDAM=m
+CONFIG_ROCKCHIP_EFUSE=m
 CONFIG_ROCKCHIP_OTP=m
-CONFIG_NVMEM_BCM_OCOTP=y
+CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_SUNXI_SID=m
-CONFIG_UNIPHIER_EFUSE=m
-CONFIG_MESON_MX_EFUSE=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
-# CONFIG_SC27XX_EFUSE is not set
-# CONFIG_NVMEM_ZYNQMP is not set
-# CONFIG_SPRD_EFUSE is not set
+CONFIG_MESON_EFUSE=m
+# CONFIG_MESON_MX_EFUSE is not set
+CONFIG_NVMEM_SNVS_LPGPR=m
+CONFIG_SC27XX_EFUSE=m
+CONFIG_NVMEM_ZYNQMP=y
+CONFIG_SPRD_EFUSE=m
 
 #
 # HW tracing support
 #
-# CONFIG_STM is not set
+CONFIG_STM=y
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+# CONFIG_STM_DUMMY is not set
+CONFIG_STM_SOURCE_CONSOLE=y
+# CONFIG_STM_SOURCE_HEARTBEAT is not set
+CONFIG_STM_SOURCE_FTRACE=m
 # CONFIG_INTEL_TH is not set
 # end of HW tracing support
 
-# CONFIG_FPGA is not set
+CONFIG_FPGA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_STRATIX10_SOC=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_OF_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_FPGA_MGR_ZYNQMP_FPGA=m
 # CONFIG_FSI is not set
-# CONFIG_TEE is not set
+CONFIG_TEE=m
+
+#
+# TEE drivers
+#
+# CONFIG_OPTEE is not set
+# end of TEE drivers
+
 CONFIG_MULTIPLEXER=m
 
 #
@@ -9128,7 +9870,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
+# CONFIG_REISERFS_PROC_INFO is not set
 CONFIG_REISERFS_FS_XATTR=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
@@ -9137,7 +9879,7 @@ CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=y
+CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 # CONFIG_XFS_RT is not set
@@ -9149,7 +9891,7 @@ CONFIG_GFS2_FS_LOCKING_DLM=y
 CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_FS_STATS=y
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
@@ -9160,7 +9902,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=y
+CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
@@ -9169,8 +9911,9 @@ CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_IO_TRACE is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS_COMPRESSION is not set
-# CONFIG_ZONEFS_FS is not set
-# CONFIG_FS_DAX is not set
+CONFIG_ZONEFS_FS=m
+CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
@@ -9188,9 +9931,9 @@ CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
 # CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=y
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=y
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
@@ -9229,11 +9972,11 @@ CONFIG_UDF_FS=m
 #
 # DOS/FAT/EXFAT/NT Filesystems
 #
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
 CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_EXFAT_FS=m
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
@@ -9246,7 +9989,9 @@ CONFIG_NTFS_FS=m
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_CHILDREN=y
@@ -9260,7 +10005,7 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=y
+CONFIG_EFIVAR_FS=m
 # end of Pseudo filesystems
 
 CONFIG_MISC_FILESYSTEMS=y
@@ -9276,18 +10021,10 @@ CONFIG_BEFS_FS=m
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS2_FS is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
-# CONFIG_UBIFS_ATIME_SUPPORT is not set
-CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_SECURITY=y
-CONFIG_UBIFS_FS_AUTHENTICATION=y
+# CONFIG_UBIFS_FS is not set
 CONFIG_CRAMFS=m
 CONFIG_CRAMFS_BLOCKDEV=y
-# CONFIG_CRAMFS_MTD is not set
+CONFIG_CRAMFS_MTD=y
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FILE_CACHE=y
 # CONFIG_SQUASHFS_FILE_DIRECT is not set
@@ -9304,25 +10041,28 @@ CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
+# CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
+CONFIG_HPFS_FS=m
 # CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
 CONFIG_ROMFS_FS=m
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
 # CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
 CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_ROMFS_ON_MTD=y
 CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
 # CONFIG_PSTORE_LZO_COMPRESS is not set
 # CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+CONFIG_PSTORE_LZ4HC_COMPRESS=m
 # CONFIG_PSTORE_842_COMPRESS is not set
 CONFIG_PSTORE_ZSTD_COMPRESS=y
 CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
 # CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_CONSOLE is not set
@@ -9337,23 +10077,25 @@ CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
 CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_POSIX_ACL=y
-# CONFIG_EROFS_FS_SECURITY is not set
-# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_ZIP=y
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
 CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V2 is not set
-CONFIG_NFS_V3=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=y
-CONFIG_PNFS_BLOCK=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DEBUG=y
@@ -9367,20 +10109,20 @@ CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_SCSILAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFSD_V4_2_INTER_SSC is not set
 CONFIG_NFSD_V4_SECURITY_LABEL=y
-CONFIG_GRACE_PERIOD=y
-CONFIG_LOCKD=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
@@ -9396,6 +10138,7 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
 CONFIG_CIFS_FSCACHE=y
 CONFIG_CODA_FS=m
 # CONFIG_AFS_FS is not set
@@ -9405,7 +10148,7 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
@@ -9428,7 +10171,7 @@ CONFIG_NLS_CODEPAGE_874=m
 CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=y
+CONFIG_NLS_ASCII=m
 CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
@@ -9475,23 +10218,16 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
 # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
-CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
-CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
+# CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY_APPARMOR=y
@@ -9502,10 +10238,13 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
 CONFIG_SECURITY_YAMA=y
 # CONFIG_SECURITY_SAFESETID is not set
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_INTEGRITY is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
 
 #
@@ -9516,10 +10255,6 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
-# CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
@@ -9532,6 +10267,8 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
@@ -9556,16 +10293,15 @@ CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
-# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
-# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_ENGINE=m
 
 #
@@ -9584,7 +10320,8 @@ CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_AEGIS128 is not set
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128_SIMD=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=m
 
@@ -9592,7 +10329,7 @@ CONFIG_CRYPTO_ECHAINIV=m
 # Block modes
 #
 CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CFB is not set
+CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
@@ -9600,7 +10337,7 @@ CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=y
-# CONFIG_CRYPTO_KEYWRAP is not set
+CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_NHPOLY1305=m
 CONFIG_CRYPTO_ADIANTUM=m
 CONFIG_CRYPTO_ESSIV=m
@@ -9617,10 +10354,10 @@ CONFIG_CRYPTO_VMAC=m
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32=y
+CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO_BLAKE2B=m
-# CONFIG_CRYPTO_BLAKE2S is not set
+CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_POLY1305=m
@@ -9668,9 +10405,9 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
 #
 # Compression
 #
-CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=y
@@ -9685,11 +10422,11 @@ CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=y
-CONFIG_CRYPTO_USER_API_HASH=y
-CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_CRYPTO_USER_API_RNG=y
-CONFIG_CRYPTO_USER_API_AEAD=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
 
@@ -9715,27 +10452,46 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
-# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_SUN8I_CE=m
 # CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set
 CONFIG_CRYPTO_DEV_SUN8I_SS=m
 # CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG is not set
-# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
 CONFIG_CRYPTO_DEV_SAHARA=m
-# CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set
-# CONFIG_CRYPTO_DEV_S5P is not set
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
+CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
+CONFIG_CRYPTO_DEV_S5P=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
 CONFIG_CRYPTO_DEV_MXS_DCP=m
-# CONFIG_CAVIUM_CPT is not set
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
-# CONFIG_CRYPTO_DEV_OCTEONTX_CPT is not set
+CONFIG_CRYPTO_DEV_CPT=m
+CONFIG_CAVIUM_CPT=m
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+CONFIG_CRYPTO_DEV_MARVELL=m
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+CONFIG_CRYPTO_DEV_OCTEONTX_CPT=m
 CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y
@@ -9745,13 +10501,16 @@ CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y
 # CONFIG_CRYPTO_DEV_QCE_ENABLE_SHA is not set
 CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
-# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
-# CONFIG_CRYPTO_DEV_ZYNQMP_AES is not set
+CONFIG_CRYPTO_DEV_ROCKCHIP=m
+CONFIG_CRYPTO_DEV_ZYNQMP_AES=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CHELSIO_IPSEC_INLINE=y
+CONFIG_CHELSIO_TLS_DEVICE=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_BCM_SPU=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
 CONFIG_CRYPTO_DEV_CCREE=m
-# CONFIG_CRYPTO_DEV_HISI_SEC is not set
+CONFIG_CRYPTO_DEV_HISI_SEC=m
 CONFIG_CRYPTO_DEV_HISI_SEC2=m
 CONFIG_CRYPTO_DEV_HISI_QM=m
 CONFIG_CRYPTO_DEV_HISI_ZIP=m
@@ -9766,7 +10525,7 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 CONFIG_TPM_KEY_PARSER=m
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
 
 #
 # Certificates for signature checking
@@ -9797,11 +10556,11 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_STMP_DEVICE=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-# CONFIG_INDIRECT_PIO is not set
+CONFIG_INDIRECT_PIO=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=y
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 CONFIG_CRC32_SLICEBY8=y
@@ -9809,17 +10568,17 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=y
-CONFIG_LIBCRC32C=y
+CONFIG_CRC4=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
 CONFIG_XXHASH=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
 # CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
+CONFIG_842_COMPRESS=y
+CONFIG_842_DECOMPRESS=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
@@ -9830,12 +10589,12 @@ CONFIG_LZ4_DECOMPRESS=y
 CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
-# CONFIG_XZ_DEC_X86 is not set
-# CONFIG_XZ_DEC_POWERPC is not set
-# CONFIG_XZ_DEC_IA64 is not set
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
-# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_SPARC=y
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
@@ -9856,6 +10615,7 @@ CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_BTREE=y
 CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
@@ -9869,6 +10629,7 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
+CONFIG_DMA_VIRT_OPS=y
 CONFIG_SWIOTLB=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_REMAP=y
@@ -9878,7 +10639,7 @@ CONFIG_DMA_CMA=y
 #
 # Default contiguous memory area size:
 #
-CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_MBYTES=0
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMA_SIZE_SEL_MIN is not set
@@ -9903,14 +10664,28 @@ CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+CONFIG_SG_SPLIT=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_MEMREGION=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
 # CONFIG_STRING_SELFTEST is not set
 # end of Library routines
 
@@ -9926,7 +10701,7 @@ CONFIG_PRINTK_TIME=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -9942,7 +10717,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
+CONFIG_FRAME_WARN=2048
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_HEADERS_INSTALL is not set
@@ -9950,23 +10725,25 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 # end of Compile-time checks and compiler options
 
 #
 # Generic Kernel Debugging Instruments
 #
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
 CONFIG_DEBUG_FS=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_KGDB=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
-CONFIG_KGDB_TESTS=y
-# CONFIG_KGDB_TESTS_ON_BOOT is not set
-# CONFIG_KGDB_KDB is not set
+# CONFIG_KGDB_TESTS is not set
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
+CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
 # end of Generic Kernel Debugging Instruments
@@ -9977,9 +10754,9 @@ CONFIG_DEBUG_MISC=y
 #
 # Memory Debugging
 #
-# CONFIG_PAGE_EXTENSION is not set
+CONFIG_PAGE_EXTENSION=y
 # CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
 CONFIG_PAGE_POISONING_NO_SANITY=y
 CONFIG_PAGE_POISONING_ZERO=y
@@ -9998,7 +10775,7 @@ CONFIG_SCHED_STACK_END_CHECK=y
 # CONFIG_DEBUG_VM is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
@@ -10007,7 +10784,7 @@ CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_KASAN_STACK=1
 # end of Memory Debugging
 
-CONFIG_DEBUG_SHIRQ=y
+# CONFIG_DEBUG_SHIRQ is not set
 
 #
 # Debug Oops, Lockups and Hangs
@@ -10015,7 +10792,10 @@ CONFIG_DEBUG_SHIRQ=y
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
@@ -10060,30 +10840,30 @@ CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 #
 # Debug kernel data structures
 #
-CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_BUG_ON_DATA_CORRUPTION=y
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # end of Debug kernel data structures
 
-CONFIG_DEBUG_CREDENTIALS=y
+# CONFIG_DEBUG_CREDENTIALS is not set
 
 #
 # RCU Debugging
 #
 CONFIG_TORTURE_TEST=m
-# CONFIG_RCU_PERF_TEST is not set
+CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_TORTURE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_TRACE=y
 # CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
 
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_LATENCYTOP is not set
+CONFIG_LATENCYTOP=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -10097,11 +10877,12 @@ CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
+CONFIG_BOOTTIME_TRACING=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_DYNAMIC_FTRACE=y
@@ -10114,7 +10895,7 @@ CONFIG_SCHED_TRACER=y
 # CONFIG_HWLAT_TRACER is not set
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 CONFIG_BLK_DEV_IO_TRACE=y
@@ -10125,14 +10906,16 @@ CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
 CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_HIST_TRIGGERS is not set
+CONFIG_TRACING_MAP=y
+CONFIG_HIST_TRIGGERS=y
 # CONFIG_TRACE_EVENT_INJECT is not set
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
-CONFIG_PREEMPTIRQ_DELAY_TEST=m
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_SYNTH_EVENT_GEN_TEST is not set
 # CONFIG_KPROBE_EVENT_GEN_TEST is not set
 # CONFIG_SAMPLES is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
@@ -10142,12 +10925,22 @@ CONFIG_IO_STRICT_DEVMEM=y
 #
 # arm64 Debugging
 #
-# CONFIG_PID_IN_CONTEXTIDR is not set
+CONFIG_PID_IN_CONTEXTIDR=y
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
 CONFIG_DEBUG_WX=y
 # CONFIG_DEBUG_EFI is not set
-# CONFIG_ARM64_RELOC_TEST is not set
-# CONFIG_CORESIGHT is not set
+CONFIG_ARM64_RELOC_TEST=m
+CONFIG_CORESIGHT=y
+CONFIG_CORESIGHT_LINKS_AND_SINKS=y
+CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
+CONFIG_CORESIGHT_CATU=y
+CONFIG_CORESIGHT_SINK_TPIU=y
+CONFIG_CORESIGHT_SINK_ETBV10=y
+CONFIG_CORESIGHT_SOURCE_ETM4X=y
+CONFIG_CORESIGHT_STM=y
+CONFIG_CORESIGHT_CPU_DEBUG=m
+CONFIG_CORESIGHT_CTI=y
+# CONFIG_CORESIGHT_CTI_INTEGRATION_REGS is not set
 # end of arm64 Debugging
 
 #
@@ -10171,12 +10964,12 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
-CONFIG_ATOMIC64_SELFTEST=y
+# CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_STRSCPY is not set
-CONFIG_TEST_KSTRTOX=y
+# CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BITFIELD is not set
@@ -10186,6 +10979,7 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_IDA is not set
+# CONFIG_TEST_PARMAN is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
@@ -10198,6 +10992,7 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set

From 144b74aa76fcf08e2a8bd5929b139a150f0ed6f1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Aug 2020 16:22:39 -0500
Subject: [PATCH 263/298] pencil2d: update to 0.6.5.

---
 srcpkgs/pencil2d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pencil2d/template b/srcpkgs/pencil2d/template
index b8ecbbc18fd..435c39a01a9 100644
--- a/srcpkgs/pencil2d/template
+++ b/srcpkgs/pencil2d/template
@@ -1,6 +1,6 @@
 # Template file for 'pencil2d'
 pkgname=pencil2d
-version=0.6.4
+version=0.6.5
 revision=1
 wrksrc=pencil-${version}
 build_style=qmake
@@ -9,11 +9,11 @@ makedepends="qt5-xmlpatterns-devel qt5-svg-devel qt5-multimedia-devel"
 depends="hicolor-icon-theme ffmpeg qt5-svg qt5-xmlpatterns"
 short_desc="Easy, intuitive tool to make 2D hand-drawn animations"
 maintainer="ghost <gh0st@vivaldi.net>"
-license="GPL-2-only"
+license="GPL-2.0-only"
 homepage="https://pencil2d.org/"
 changelog="https://raw.githubusercontent.com/pencil2d/pencil/master/ChangeLog.md"
 distfiles="https://github.com/${pkgname}/pencil/archive/v${version}.tar.gz"
-checksum=9be6d699cb5a960af89a10ee77dce33ddfe050eb3f0327a055e13f395d92afe6
+checksum=31903c54c8f0a79385cc5f519b380d26524219984e619204820b946c96fc2482
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-xmlpatterns-devel qt5-svg-devel qt5-multimedia-devel"

From 060e7da80baab726081dd4e96ea3c78c59388085 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Mon, 3 Aug 2020 10:09:31 +0200
Subject: [PATCH 264/298] pueue: update to 0.7.1

---
 srcpkgs/pueue/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pueue/template b/srcpkgs/pueue/template
index e966c705b39..8e0d50edd30 100644
--- a/srcpkgs/pueue/template
+++ b/srcpkgs/pueue/template
@@ -1,6 +1,6 @@
 # Template file for 'pueue'
 pkgname=pueue
-version=0.6.1
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Command-line tool for managing long-running tasks"
@@ -8,7 +8,7 @@ maintainer="crater2150 <void@qwertyuiop.de>"
 license="MIT"
 homepage="https://github.com/Nukesor/pueue"
 distfiles="https://github.com/Nukesor/pueue/archive/v${version}.tar.gz"
-checksum=fa9691ff7441bee19eab2bf15238a1c014059968dcc26cc394772061f1000122
+checksum=bb114aa443624a4ceb5bbfe498b5be6e4dd8cde32e749602afdfdc24846bc82e
 
 post_install() {
 	vlicense LICENSE

From 08bd66f797c33ee214c310555acf1ef56332e7cf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Aug 2020 16:37:56 -0500
Subject: [PATCH 265/298] i3-gaps: update to 4.18.2.

---
 srcpkgs/i3-gaps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index 8b0ac1faafb..1a7080ac28d 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,6 +1,6 @@
 # Template file for 'i3-gaps'
 pkgname=i3-gaps
-version=4.18.1
+version=4.18.2
 revision=1
 wrksrc="i3-${version}"
 build_style=gnu-configure
@@ -17,7 +17,7 @@ maintainer="ian c. <ian@airmail.cc>"
 license="BSD-3-Clause"
 homepage="https://github.com/Airblader/i3"
 distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=3f709e7b38938fa152ca730b9940634c5b1bcf3d9db38d023b30820d522df31d
+checksum=cc03cc008f51792b3c2fd5c8815ec213f8040385865fa558b0c78d5dc5f7150d
 
 provides="i3-${version}_${revision}"
 replaces="i3>=0"

From 8a224519c1c237e99effb0e544c78d24208b567f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 3 Aug 2020 23:19:50 +0200
Subject: [PATCH 266/298] linux5.4: new config for arm64

Equivalent to 1d7fec69eaae0ca7eb183424d8e0f9fe9dc0656e
---
 srcpkgs/linux5.4/files/arm64-dotconfig | 5261 ++++++++++++++----------
 1 file changed, 3011 insertions(+), 2250 deletions(-)

diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index 80448d34766..7c2ec3b34b9 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.51 Kernel Configuration
+# Linux/arm64 5.4.55 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-gnu-gcc (GCC) 9.3.0
+# Compiler: gcc (GCC) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90300
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -47,6 +47,7 @@ CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_SIM=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
 CONFIG_GENERIC_MSI_IRQ=y
@@ -73,6 +74,8 @@ CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
+CONFIG_CONTEXT_TRACKING=y
+# CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # end of Timers subsystem
@@ -84,10 +87,10 @@ CONFIG_PREEMPT_VOLUNTARY=y
 #
 # CPU/Task time and stats accounting
 #
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+CONFIG_VIRT_CPU_ACCOUNTING=y
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_HAVE_SCHED_AVG_IRQ=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
@@ -128,20 +131,22 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_SWAP_ENABLED=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
@@ -159,7 +164,7 @@ CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SCHED_AUTOGROUP is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
@@ -205,7 +210,7 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_USERFAULTFD is not set
+CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
@@ -229,7 +234,7 @@ CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
+CONFIG_SLAB_FREELIST_HARDENED=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
@@ -240,11 +245,11 @@ CONFIG_TRACEPOINTS=y
 CONFIG_ARM64=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
-CONFIG_ARM64_PAGE_SHIFT=16
-CONFIG_ARM64_CONT_SHIFT=5
-CONFIG_ARCH_MMAP_RND_BITS_MIN=14
-CONFIG_ARCH_MMAP_RND_BITS_MAX=29
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
+CONFIG_ARM64_PAGE_SHIFT=12
+CONFIG_ARM64_CONT_SHIFT=4
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
@@ -260,7 +265,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SMP=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=3
+CONFIG_PGTABLE_LEVELS=4
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 
@@ -268,7 +273,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 # Platform selection
 #
 CONFIG_ARCH_ACTIONS=y
-# CONFIG_ARCH_AGILEX is not set
+CONFIG_ARCH_AGILEX=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_ALPINE=y
 CONFIG_ARCH_BCM2835=y
@@ -287,7 +292,7 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_MXC=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_REALTEK=y
-CONFIG_ARCH_RENESAS=y
+# CONFIG_ARCH_RENESAS is not set
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SEATTLE=y
 CONFIG_ARCH_STRATIX10=y
@@ -296,7 +301,7 @@ CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_SPRD=y
 CONFIG_ARCH_THUNDER=y
 CONFIG_ARCH_THUNDER2=y
-CONFIG_ARCH_UNIPHIER=y
+# CONFIG_ARCH_UNIPHIER is not set
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 CONFIG_ARCH_ZX=y
@@ -326,6 +331,7 @@ CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
 CONFIG_CAVIUM_ERRATUM_30115=y
@@ -340,22 +346,24 @@ CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_FUJITSU_ERRATUM_010001=y
 # end of ARM errata workarounds via the alternatives framework
 
-# CONFIG_ARM64_4K_PAGES is not set
+CONFIG_ARM64_4K_PAGES=y
 # CONFIG_ARM64_16K_PAGES is not set
-CONFIG_ARM64_64K_PAGES=y
-# CONFIG_ARM64_VA_BITS_42 is not set
+# CONFIG_ARM64_64K_PAGES is not set
+# CONFIG_ARM64_VA_BITS_39 is not set
 CONFIG_ARM64_VA_BITS_48=y
-# CONFIG_ARM64_VA_BITS_52 is not set
 CONFIG_ARM64_VA_BITS=48
 CONFIG_ARM64_PA_BITS_48=y
-# CONFIG_ARM64_PA_BITS_52 is not set
 CONFIG_ARM64_PA_BITS=48
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
-CONFIG_NR_CPUS=8
+CONFIG_NR_CPUS=480
 CONFIG_HOTPLUG_CPU=y
-# CONFIG_NUMA is not set
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=6
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_HOLES_IN_ZONE=y
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
@@ -367,19 +375,18 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_SECCOMP=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+# CONFIG_PARAVIRT is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
-CONFIG_KEXEC_FILE=y
-# CONFIG_KEXEC_SIG is not set
-# CONFIG_CRASH_DUMP is not set
+# CONFIG_KEXEC_FILE is not set
+CONFIG_CRASH_DUMP=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
@@ -387,18 +394,21 @@ CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
+# CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_COMPAT=y
 CONFIG_KUSER_HELPERS=y
-# CONFIG_ARMV8_DEPRECATED is not set
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
 
 #
 # ARMv8.1 architectural features
 #
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
-# CONFIG_ARM64_LSE_ATOMICS is not set
+CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_VHE=y
 # end of ARMv8.1 architectural features
 
@@ -419,7 +429,8 @@ CONFIG_ARM64_PTR_AUTH=y
 
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_MODULE_PLTS=y
-# CONFIG_ARM64_PSEUDO_NMI is not set
+CONFIG_ARM64_PSEUDO_NMI=y
+# CONFIG_ARM64_DEBUG_PRIORITY_MASKING is not set
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
@@ -431,7 +442,7 @@ CONFIG_STACKPROTECTOR_PER_TASK=y
 # Boot options
 #
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
-CONFIG_CMDLINE="console=ttyAMA0"
+CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
@@ -447,17 +458,22 @@ CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SUSPEND_SKIP_SYNC is not set
-# CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_ADVANCED_DEBUG is not set
-CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_DPM_WATCHDOG is not set
+CONFIG_DPM_WATCHDOG=y
+CONFIG_DPM_WATCHDOG_TIMEOUT=60
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
@@ -466,6 +482,7 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_CPU_PM=y
 CONFIG_ENERGY_MODEL=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_HIBERNATION_HEADER=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # end of Power management options
 
@@ -498,54 +515,58 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 
 #
 # CPU frequency scaling drivers
 #
-CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT=m
 CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_ACPI_CPPC_CPUFREQ=y
+CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
-# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
 CONFIG_ARM_ARMADA_8K_CPUFREQ=m
-CONFIG_ARM_SCPI_CPUFREQ=y
-CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y
-# CONFIG_ARM_IMX_CPUFREQ_DT is not set
+CONFIG_ARM_SCPI_CPUFREQ=m
+CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=m
+CONFIG_ARM_IMX_CPUFREQ_DT=m
 CONFIG_ARM_MEDIATEK_CPUFREQ=m
 CONFIG_ARM_QCOM_CPUFREQ_NVMEM=m
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
-CONFIG_ARM_TEGRA20_CPUFREQ=y
+CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
+CONFIG_ARM_SCMI_CPUFREQ=m
+# CONFIG_ARM_TEGRA20_CPUFREQ is not set
 CONFIG_ARM_TEGRA124_CPUFREQ=y
-CONFIG_ARM_TEGRA186_CPUFREQ=y
-# CONFIG_QORIQ_CPUFREQ is not set
+CONFIG_ARM_TEGRA186_CPUFREQ=m
+CONFIG_QORIQ_CPUFREQ=m
 # end of CPU Frequency scaling
 # end of CPU Power Management
 
 #
 # Firmware Drivers
 #
-# CONFIG_ARM_SCMI_PROTOCOL is not set
-CONFIG_ARM_SCPI_PROTOCOL=y
-CONFIG_ARM_SCPI_POWER_DOMAIN=y
-# CONFIG_ARM_SDE_INTERFACE is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_SCMI_POWER_DOMAIN=m
+CONFIG_ARM_SCPI_PROTOCOL=m
+CONFIG_ARM_SCPI_POWER_DOMAIN=m
+CONFIG_ARM_SDE_INTERFACE=y
+CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=y
-# CONFIG_ISCSI_IBFT is not set
+CONFIG_DMI_SYSFS=m
+CONFIG_ISCSI_IBFT=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
-# CONFIG_FW_CFG_SYSFS is not set
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_FW_CFG_SYSFS_CMDLINE=y
 CONFIG_INTEL_STRATIX10_SERVICE=m
 CONFIG_INTEL_STRATIX10_RSU=m
 CONFIG_QCOM_SCM=y
@@ -562,25 +583,26 @@ CONFIG_ARM_PSCI_FW=y
 #
 CONFIG_EFI_VARS=y
 CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=y
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_EFI_PARAMS_FROM_FDT=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_ARMSTUB=y
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-CONFIG_EFI_BOOTLOADER_CONTROL=y
-# CONFIG_EFI_CAPSULE_LOADER is not set
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=m
 # CONFIG_EFI_TEST is not set
-CONFIG_RESET_ATTACK_MITIGATION=y
+# CONFIG_RESET_ATTACK_MITIGATION is not set
 # end of EFI (Extensible Firmware Interface) Support
 
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_ARM=y
 CONFIG_EFI_EARLYCON=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
-# CONFIG_IMX_DSP is not set
+CONFIG_IMX_DSP=y
 CONFIG_IMX_SCU=y
-# CONFIG_IMX_SCU_PD is not set
+CONFIG_IMX_SCU_PD=y
+CONFIG_MESON_SM=y
 
 #
 # Tegra firmware driver
@@ -603,12 +625,12 @@ CONFIG_ACPI_GENERIC_GSI=y
 CONFIG_ACPI_CCA_REQUIRED=y
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_EC_DEBUGFS=y
-CONFIG_ACPI_AC=y
-CONFIG_ACPI_BATTERY=y
+# CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_FAN=y
-# CONFIG_ACPI_TAD is not set
+CONFIG_ACPI_TAD=m
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
 CONFIG_ACPI_MCFG=y
@@ -617,28 +639,36 @@ CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_CUSTOM_DSDT_FILE=""
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=y
-# CONFIG_ACPI_BGRT is not set
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
 CONFIG_ACPI_NFIT=m
 # CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_HMAT=y
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_ACPI_APEI=y
-# CONFIG_ACPI_APEI_GHES is not set
-# CONFIG_ACPI_APEI_PCIEAER is not set
-# CONFIG_ACPI_APEI_EINJ is not set
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_SEA=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_WATCHDOG=y
 CONFIG_PMIC_OPREGION=y
 CONFIG_ACPI_CONFIGFS=m
 CONFIG_ACPI_IORT=y
 CONFIG_ACPI_GTDT=y
 CONFIG_ACPI_PPTT=y
+# CONFIG_TPS68470_PMIC_OPREGION is not set
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
 CONFIG_HAVE_KVM_IRQ_ROUTING=y
@@ -663,21 +693,21 @@ CONFIG_VHOST_VSOCK=m
 CONFIG_VHOST=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=y
+CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM64=m
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-# CONFIG_CRYPTO_SHA512_ARM64_CE is not set
-# CONFIG_CRYPTO_SHA3_ARM64 is not set
-# CONFIG_CRYPTO_SM3_ARM64_CE is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_SM4_ARM64_CE=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=m
+CONFIG_CRYPTO_AES_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_AES_ARM64_BS=m
@@ -738,9 +768,9 @@ CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=14
+CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=7
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_HAVE_COPY_THREAD_TLS=y
 CONFIG_CLONE_BACKWARDS=y
@@ -769,16 +799,13 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MODVERSIONS=y
@@ -787,9 +814,11 @@ CONFIG_ASM_MODVERSIONS=y
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-CONFIG_UNUSED_SYMBOLS=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
+CONFIG_BLK_RQ_ALLOC_TIME=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -797,10 +826,10 @@ CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
-CONFIG_BLK_CMDLINE_PARSER=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
 CONFIG_BLK_WBT=y
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
-# CONFIG_BLK_CGROUP_IOCOST is not set
+CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEBUG_FS_ZONED=y
@@ -811,30 +840,31 @@ CONFIG_BLK_DEBUG_FS_ZONED=y
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
+# CONFIG_AIX_PARTITION is not set
 CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-# CONFIG_ATARI_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+CONFIG_ATARI_PARTITION=y
 CONFIG_MAC_PARTITION=y
 CONFIG_MSDOS_PARTITION=y
 CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
+# CONFIG_MINIX_SUBPARTITION is not set
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_LDM_PARTITION=y
 # CONFIG_LDM_DEBUG is not set
 CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
+CONFIG_SYSV68_PARTITION=y
 # CONFIG_CMDLINE_PARTITION is not set
 # end of Partition Types
 
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
 CONFIG_BLK_PM=y
 
 #
@@ -920,7 +950,7 @@ CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=y
+CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
 # end of Executable file formats
 
@@ -928,17 +958,20 @@ CONFIG_COREDUMP=y
 # Memory Management options
 #
 CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_HAVE_FAST_GUP=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
-# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -948,30 +981,36 @@ CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
-CONFIG_CMA_DEBUGFS=y
+# CONFIG_CMA_DEBUGFS is not set
 CONFIG_CMA_AREAS=7
 CONFIG_ZSWAP=y
 CONFIG_ZPOOL=y
 CONFIG_ZBUD=y
-# CONFIG_Z3FOLD is not set
+CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
 # CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_HMM_MIRROR=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
+CONFIG_READ_ONLY_THP_FOR_FS=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 # end of Memory Management options
 
@@ -985,32 +1024,40 @@ CONFIG_SKB_EXTENSIONS=y
 #
 # Networking options
 #
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
+CONFIG_TLS=m
+CONFIG_TLS_DEVICE=y
 CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
+# CONFIG_XFRM_STATISTICS is not set
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_XDP_SOCKETS is not set
+CONFIG_SMC=m
+CONFIG_SMC_DIAG=m
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IP_TUNNEL=m
@@ -1028,7 +1075,7 @@ CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
+CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
@@ -1061,12 +1108,12 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
+CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
@@ -1089,7 +1136,7 @@ CONFIG_IPV6_SEG6_BPF=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_BRIDGE_NETFILTER=m
@@ -1173,14 +1220,14 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
+CONFIG_NFT_SYNPROXY=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XTABLES=m
 
 #
 # Xtables combined modules
@@ -1192,7 +1239,7 @@ CONFIG_NETFILTER_XT_SET=m
 #
 # Xtables targets
 #
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -1317,7 +1364,7 @@ CONFIG_IP_VS_LBLC=m
 CONFIG_IP_VS_LBLCR=m
 CONFIG_IP_VS_DH=m
 CONFIG_IP_VS_SH=m
-# CONFIG_IP_VS_MH is not set
+CONFIG_IP_VS_MH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
@@ -1353,11 +1400,11 @@ CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=y
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_RPFILTER=m
@@ -1417,8 +1464,11 @@ CONFIG_IP6_NF_TARGET_NPT=m
 # end of IPv6: Netfilter Configuration
 
 CONFIG_NF_DEFRAG_IPV6=m
-# CONFIG_NF_TABLES_BRIDGE is not set
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1440,7 +1490,8 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
+CONFIG_BPFILTER=y
+# CONFIG_BPFILTER_UMH is not set
 CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
@@ -1461,23 +1512,25 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
 CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_COOKIE_HMAC_SHA1 is not set
 CONFIG_INET_SCTP_DIAG=m
 CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
 CONFIG_RDS_TCP=m
 # CONFIG_RDS_DEBUG is not set
 CONFIG_TIPC=m
+# CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
 CONFIG_TIPC_DIAG=m
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
-# CONFIG_ATM_MPOA is not set
+CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_L2TP=m
@@ -1511,14 +1564,14 @@ CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
-# CONFIG_LLC2 is not set
+CONFIG_LLC2=m
 CONFIG_ATALK=m
 CONFIG_DEV_APPLETALK=m
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
 CONFIG_6LOWPAN=m
 # CONFIG_6LOWPAN_DEBUGFS is not set
 CONFIG_6LOWPAN_NHC=m
@@ -1536,7 +1589,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
 CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
 CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
 CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
 CONFIG_IEEE802154_SOCKET=m
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_MAC802154=m
@@ -1568,7 +1621,7 @@ CONFIG_NET_SCH_SKBPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_CAKE=m
 CONFIG_NET_SCH_FQ=m
 CONFIG_NET_SCH_HHF=m
@@ -1591,7 +1644,7 @@ CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
 CONFIG_NET_CLS_FLOWER=m
 CONFIG_NET_CLS_MATCHALL=m
@@ -1604,43 +1657,43 @@ CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
 CONFIG_NET_EMATCH_CANID=m
 CONFIG_NET_EMATCH_IPSET=m
-# CONFIG_NET_EMATCH_IPT is not set
+CONFIG_NET_EMATCH_IPT=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
+CONFIG_NET_ACT_SAMPLE=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
+CONFIG_NET_ACT_MPLS=m
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
+CONFIG_NET_ACT_CTINFO=m
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
+CONFIG_NET_ACT_CT=m
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_TC_SKB_EXT=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
-CONFIG_DNS_RESOLVER=y
+CONFIG_DNS_RESOLVER=m
 CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BATMAN_V=y
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_DEBUG=y
 CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
@@ -1655,15 +1708,16 @@ CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPLS_IPTUNNEL is not set
+CONFIG_MPLS_IPTUNNEL=m
 CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
-# CONFIG_QRTR_TUN is not set
-# CONFIG_NET_NCSI is not set
+CONFIG_QRTR_TUN=m
+CONFIG_NET_NCSI=y
+CONFIG_NCSI_OEM_CMD_GET_MAC=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -1701,6 +1755,7 @@ CONFIG_6PACK=m
 CONFIG_BPQETHER=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
 CONFIG_YAM=m
 # end of AX.25 network device drivers
 
@@ -1708,48 +1763,47 @@ CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
 CONFIG_CAN_GW=m
-# CONFIG_CAN_J1939 is not set
+CONFIG_CAN_J1939=m
 
 #
 # CAN Device Drivers
 #
 CONFIG_CAN_VCAN=m
-# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_VXCAN=m
 CONFIG_CAN_SLCAN=m
 CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_FLEXCAN is not set
+CONFIG_CAN_FLEXCAN=m
 # CONFIG_CAN_GRCAN is not set
-# CONFIG_CAN_KVASER_PCIEFD is not set
-# CONFIG_CAN_XILINXCAN is not set
+CONFIG_CAN_KVASER_PCIEFD=m
+CONFIG_CAN_XILINXCAN=m
 CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
+# CONFIG_CAN_C_CAN_PLATFORM is not set
 CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_CC770=m
-# CONFIG_CAN_CC770_ISA is not set
-CONFIG_CAN_CC770_PLATFORM=m
-# CONFIG_CAN_IFI_CANFD is not set
+# CONFIG_CAN_CC770 is not set
+CONFIG_CAN_IFI_CANFD=m
 CONFIG_CAN_M_CAN=m
-# CONFIG_CAN_M_CAN_PLATFORM is not set
-# CONFIG_CAN_M_CAN_TCAN4X5X is not set
-# CONFIG_CAN_PEAK_PCIEFD is not set
-# CONFIG_CAN_RCAR is not set
-# CONFIG_CAN_RCAR_CANFD is not set
+CONFIG_CAN_M_CAN_PLATFORM=m
+CONFIG_CAN_M_CAN_TCAN4X5X=m
+CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_SJA1000=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_F81601 is not set
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_F81601=m
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PEAK_PCI=m
 CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_PCMCIA=m
 CONFIG_CAN_PLX_PCI=m
 # CONFIG_CAN_SJA1000_ISA is not set
-CONFIG_CAN_SJA1000_PLATFORM=m
+# CONFIG_CAN_SJA1000_PLATFORM is not set
 CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
 
 #
 # CAN SPI interfaces
 #
-# CONFIG_CAN_HI311X is not set
+CONFIG_CAN_HI311X=m
 # CONFIG_CAN_MCP251X is not set
 # end of CAN SPI interfaces
 
@@ -1761,7 +1815,7 @@ CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
-# CONFIG_CAN_MCBA_USB is not set
+CONFIG_CAN_MCBA_USB=m
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
 # end of CAN USB interfaces
@@ -1780,7 +1834,7 @@ CONFIG_BT_HIDP=m
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_LEDS is not set
+CONFIG_BT_LEDS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BT_DEBUGFS is not set
 
@@ -1794,29 +1848,46 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
+CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
 CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
-# CONFIG_BT_HCIUART_AG6XX is not set
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
 CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
 CONFIG_BT_QCOMSMD=m
 CONFIG_BT_HCIRSI=m
 # end of Bluetooth device drivers
 
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=y
+CONFIG_AF_KCM=m
 CONFIG_STREAM_PARSER=y
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
@@ -1832,7 +1903,7 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
-CONFIG_CFG80211_DEBUGFS=y
+# CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_CFG80211_WEXT_EXPORT=y
@@ -1852,23 +1923,28 @@ CONFIG_MAC80211_DEBUGFS=y
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-# CONFIG_WIMAX is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_GPIO=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
 # CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
 CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_PRETTYDEBUG=y
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 CONFIG_NFC=m
 CONFIG_NFC_DIGITAL=m
 CONFIG_NFC_NCI=m
 # CONFIG_NFC_NCI_SPI is not set
-# CONFIG_NFC_NCI_UART is not set
+CONFIG_NFC_NCI_UART=m
 CONFIG_NFC_HCI=m
 CONFIG_NFC_SHDLC=y
 
@@ -1881,28 +1957,34 @@ CONFIG_NFC_PORT100=m
 # CONFIG_NFC_FDP is not set
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_I2C=m
-# CONFIG_NFC_PN533_USB is not set
-# CONFIG_NFC_PN533_I2C is not set
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_MICROREAD=m
 CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MRVL=m
 CONFIG_NFC_MRVL_USB=m
-# CONFIG_NFC_MRVL_I2C is not set
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
 CONFIG_NFC_ST21NFCA=m
 CONFIG_NFC_ST21NFCA_I2C=m
-# CONFIG_NFC_ST_NCI_I2C is not set
-# CONFIG_NFC_ST_NCI_SPI is not set
-# CONFIG_NFC_NXP_NCI is not set
-# CONFIG_NFC_S3FWRN5_I2C is not set
-# CONFIG_NFC_ST95HF is not set
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_ST95HF=m
 # end of Near Field Communication (NFC) devices
 
-# CONFIG_PSAMPLE is not set
+CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
+CONFIG_SOCK_VALIDATE_XMIT=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
@@ -1923,7 +2005,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=m
-CONFIG_PCIE_ECRC=y
+# CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
@@ -1931,16 +2013,16 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
-# CONFIG_PCIE_DPC is not set
-# CONFIG_PCIE_PTM is not set
-CONFIG_PCIE_BW=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_BW is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 CONFIG_PCI_STUB=y
-# CONFIG_PCI_PF_STUB is not set
+CONFIG_PCI_PF_STUB=m
 CONFIG_PCI_ATS=y
 CONFIG_PCI_ECAM=y
 CONFIG_PCI_BRIDGE_EMUL=y
@@ -1951,8 +2033,8 @@ CONFIG_PCI_LABEL=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
 
 #
 # PCI controller drivers
@@ -1962,68 +2044,92 @@ CONFIG_PCI_AARDVARK=y
 #
 # Cadence PCIe controllers support
 #
-# CONFIG_PCIE_CADENCE_HOST is not set
+CONFIG_PCIE_CADENCE=y
+CONFIG_PCIE_CADENCE_HOST=y
+CONFIG_PCIE_CADENCE_EP=y
 # end of Cadence PCIe controllers support
 
-# CONFIG_PCIE_XILINX_NWL is not set
-# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCIE_XILINX_NWL=y
+CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_TEGRA=y
-# CONFIG_PCIE_RCAR is not set
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_XILINX=y
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
-CONFIG_PCIE_IPROC=y
-CONFIG_PCIE_IPROC_PLATFORM=y
+CONFIG_PCIE_IPROC=m
+CONFIG_PCIE_IPROC_PLATFORM=m
 CONFIG_PCIE_IPROC_MSI=y
 CONFIG_PCIE_ALTERA=y
 CONFIG_PCIE_ALTERA_MSI=y
-# CONFIG_PCI_HOST_THUNDER_PEM is not set
-# CONFIG_PCI_HOST_THUNDER_ECAM is not set
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PCIE_ROCKCHIP_EP=y
 CONFIG_PCIE_MEDIATEK=y
-# CONFIG_PCIE_MOBIVEIL is not set
+CONFIG_PCIE_MOBIVEIL=y
 
 #
 # DesignWare PCI Core Support
 #
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
-# CONFIG_PCIE_DW_PLAT_HOST is not set
+CONFIG_PCIE_DW_EP=y
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+CONFIG_PCIE_DW_PLAT_EP=y
 CONFIG_PCI_IMX6=y
-# CONFIG_PCI_LAYERSCAPE is not set
+CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCI_LAYERSCAPE_EP=y
 CONFIG_PCI_HISI=y
 CONFIG_PCIE_QCOM=y
-# CONFIG_PCIE_ARMADA_8K is not set
-# CONFIG_PCIE_KIRIN is not set
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_PCIE_KIRIN=y
 CONFIG_PCIE_HISI_STB=y
 CONFIG_PCI_MESON=y
-CONFIG_PCIE_UNIPHIER=y
-# CONFIG_PCIE_AL is not set
+CONFIG_PCIE_TEGRA194=m
+CONFIG_PCIE_AL=y
 # end of DesignWare PCI Core Support
 # end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
-# CONFIG_PCI_ENDPOINT is not set
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+CONFIG_PCI_EPF_TEST=m
 # end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
-# CONFIG_PCI_SW_SWITCHTEC is not set
+CONFIG_PCI_SW_SWITCHTEC=m
 # end of PCI switch controller drivers
 
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
 CONFIG_RAPIDIO=m
 CONFIG_RAPIDIO_TSI721=m
 CONFIG_RAPIDIO_DISC_TIMEOUT=30
-CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
 CONFIG_RAPIDIO_DMA_ENGINE=y
-CONFIG_RAPIDIO_DEBUG=y
+# CONFIG_RAPIDIO_DEBUG is not set
 CONFIG_RAPIDIO_ENUM_BASIC=m
 CONFIG_RAPIDIO_CHMAN=m
 CONFIG_RAPIDIO_MPORT_CDEV=m
@@ -2031,48 +2137,54 @@ CONFIG_RAPIDIO_MPORT_CDEV=m
 #
 # RapidIO Switch drivers
 #
-# CONFIG_RAPIDIO_TSI57X is not set
-# CONFIG_RAPIDIO_CPS_XX is not set
-# CONFIG_RAPIDIO_TSI568 is not set
-# CONFIG_RAPIDIO_CPS_GEN2 is not set
-# CONFIG_RAPIDIO_RXS_GEN3 is not set
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
 # end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
+# CONFIG_STANDALONE is not set
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
 #
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
 # end of Firmware loader
 
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
-CONFIG_DEBUG_DEVRES=y
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+CONFIG_HMEM_REPORTING=y
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=m
-CONFIG_REGMAP_SPMI=y
+CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP_W1=m
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SCCB=m
+CONFIG_REGMAP_I3C=m
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
@@ -2083,35 +2195,41 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 #
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI400_COMMON=y
-# CONFIG_BRCMSTB_GISB_ARB is not set
-# CONFIG_MOXTET is not set
-# CONFIG_HISILICON_LPC is not set
-# CONFIG_IMX_WEIM is not set
+CONFIG_BRCMSTB_GISB_ARB=y
+CONFIG_MOXTET=m
+CONFIG_HISILICON_LPC=y
+CONFIG_IMX_WEIM=y
 CONFIG_QCOM_EBI2=y
-# CONFIG_SIMPLE_PM_BUS is not set
+CONFIG_SIMPLE_PM_BUS=y
 CONFIG_SUN50I_DE2_BUS=y
-CONFIG_SUNXI_RSB=y
-# CONFIG_TEGRA_ACONNECT is not set
+CONFIG_SUNXI_RSB=m
+CONFIG_TEGRA_ACONNECT=y
 CONFIG_TEGRA_GMI=m
-CONFIG_UNIPHIER_SYSTEM_BUS=y
 CONFIG_VEXPRESS_CONFIG=y
-# CONFIG_FSL_MC_BUS is not set
+CONFIG_FSL_MC_BUS=y
 # end of Bus devices
 
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
-CONFIG_MTD=y
-# CONFIG_MTD_TESTS is not set
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
 
 #
 # Partition parsers
 #
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
 CONFIG_MTD_OF_PARTS=m
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_AFS_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
 # end of Partition parsers
 
 #
@@ -2119,60 +2237,81 @@ CONFIG_MTD_OF_PARTS=m
 #
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
 # CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+CONFIG_MTD_PARTITIONED_MASTER=y
 
 #
 # RAM/ROM/Flash chip drivers
 #
 CONFIG_MTD_CFI=m
-# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_JEDECPROBE=m
 CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
 CONFIG_MTD_CFI_INTELEXT=m
 CONFIG_MTD_CFI_AMDSTD=m
 CONFIG_MTD_CFI_STAA=m
 CONFIG_MTD_CFI_UTIL=m
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
 # end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
 #
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_COMPLEX_MAPPINGS=y
 CONFIG_MTD_PHYSMAP=m
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP_OF is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_PLATRAM is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
+CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
 # end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
 #
-# CONFIG_MTD_PMC551 is not set
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
 # CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_MCHP23K256 is not set
+CONFIG_MTD_MCHP23K256=m
 # CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
 
 #
 # Disk-On-Chip Device Drivers
@@ -2181,7 +2320,11 @@ CONFIG_MTD_PHYSMAP=m
 # end of Self-contained MTD device drivers
 
 CONFIG_MTD_NAND_CORE=m
-# CONFIG_MTD_ONENAND is not set
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
 CONFIG_MTD_NAND_ECC_SW_HAMMING=m
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
 CONFIG_MTD_RAW_NAND=m
@@ -2191,11 +2334,12 @@ CONFIG_MTD_NAND_ECC_SW_BCH=y
 # Raw/parallel NAND flash controllers
 #
 CONFIG_MTD_NAND_DENALI=m
-CONFIG_MTD_NAND_DENALI_PCI=m
+# CONFIG_MTD_NAND_DENALI_PCI is not set
 CONFIG_MTD_NAND_DENALI_DT=m
 CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_MARVELL=m
-CONFIG_MTD_NAND_BRCMNAND=m
+# CONFIG_MTD_NAND_BRCMNAND is not set
+CONFIG_MTD_NAND_GPMI_NAND=m
 CONFIG_MTD_NAND_FSL_IFC=m
 CONFIG_MTD_NAND_MXC=m
 CONFIG_MTD_NAND_SUNXI=m
@@ -2218,16 +2362,17 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
 CONFIG_MTD_SPI_NAND=m
 
 #
 # LPDDR & LPDDR2 PCM memory drivers
 #
-# CONFIG_MTD_LPDDR is not set
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
 # end of LPDDR & LPDDR2 PCM memory drivers
 
-CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_CADENCE_QUADSPI=m
 CONFIG_SPI_HISI_SFC=m
@@ -2236,9 +2381,10 @@ CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_MTD_HYPERBUS is not set
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+CONFIG_HBMC_AM654=m
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -2253,7 +2399,11 @@ CONFIG_OF_MDIO=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
-# CONFIG_PARPORT is not set
+CONFIG_OF_NUMA=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
 CONFIG_PNP=y
 CONFIG_PNP_DEBUG_MESSAGES=y
 
@@ -2263,15 +2413,15 @@ CONFIG_PNP_DEBUG_MESSAGES=y
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_CDROM=y
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+CONFIG_CDROM=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
 CONFIG_ZRAM_WRITEBACK=y
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
@@ -2279,15 +2429,15 @@ CONFIG_BLK_DEV_SKD=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CDROM_PKTCDVD_WCACHE=y
 CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_BLK_DEV_RBD=m
-# CONFIG_BLK_DEV_RSXX is not set
+CONFIG_BLK_DEV_RSXX=m
 
 #
 # NVME Support
@@ -2296,41 +2446,49 @@ CONFIG_NVME_CORE=m
 CONFIG_BLK_DEV_NVME=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_TCP=m
-# CONFIG_NVME_TARGET is not set
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
 # end of NVME Support
 
 #
 # Misc devices
 #
 CONFIG_SENSORS_LIS3LV02D=m
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_PHANTOM is not set
-CONFIG_TIFM_CORE=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+CONFIG_DUMMY_IRQ=m
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
-# CONFIG_ICS932S401 is not set
+CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
-# CONFIG_HP_ILO is not set
+CONFIG_HP_ILO=m
 # CONFIG_QCOM_COINCELL is not set
 CONFIG_QCOM_FASTRPC=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
 CONFIG_ISL29020=m
 CONFIG_SENSORS_TSL2550=m
 CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
 CONFIG_VEXPRESS_SYSCFG=y
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
+CONFIG_PCI_ENDPOINT_TEST=m
+CONFIG_XILINX_SDFEC=m
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
-# CONFIG_C2PORT is not set
+CONFIG_C2PORT=m
 
 #
 # EEPROM support
@@ -2341,18 +2499,18 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
+CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
 # end of EEPROM support
 
-CONFIG_CB710_CORE=y
+CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 
 #
 # Texas Instruments shared transport line discipline
 #
-# CONFIG_TI_ST is not set
+CONFIG_TI_ST=m
 # end of Texas Instruments shared transport line discipline
 
 CONFIG_SENSORS_LIS3_I2C=m
@@ -2373,7 +2531,7 @@ CONFIG_ALTERA_STAPL=m
 #
 # VOP Bus Driver
 #
-CONFIG_VOP_BUS=m
+# CONFIG_VOP_BUS is not set
 
 #
 # Intel MIC Host Driver
@@ -2394,11 +2552,11 @@ CONFIG_VOP_BUS=m
 #
 # VOP Driver
 #
-CONFIG_VOP=m
 CONFIG_VHOST_RING=m
 # end of Intel MIC & related support
 
-# CONFIG_GENWQE is not set
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 CONFIG_ECHO=m
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
@@ -2421,9 +2579,8 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_CONSTANTS=y
@@ -2446,26 +2603,38 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_SCSI_BNX2X_FCOE=m
 CONFIG_BE2ISCSI=m
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_HISI_SAS is not set
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=5000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_HISI_SAS=m
+CONFIG_SCSI_HISI_SAS_PCI=m
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_MVUMI=m
-# CONFIG_SCSI_ADVANSYS is not set
+CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ESAS2R=m
 CONFIG_MEGARAID_NEWGEN=y
@@ -2473,18 +2642,20 @@ CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_SMARTPQI is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_SMARTPQI=m
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
 CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_UFS_CDNS_PLATFORM=m
 # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
-CONFIG_SCSI_UFS_QCOM=m
+# CONFIG_SCSI_UFS_QCOM is not set
 CONFIG_SCSI_UFS_MEDIATEK=m
-# CONFIG_SCSI_UFS_HISI is not set
+CONFIG_SCSI_UFS_HISI=m
 CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_MYRB=m
@@ -2495,9 +2666,10 @@ CONFIG_FCOE=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_IPS is not set
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+# CONFIG_SCSI_GDTH is not set
+CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_STEX=m
@@ -2514,6 +2686,8 @@ CONFIG_SCSI_QLA_FC=m
 CONFIG_TCM_QLA2XXX=m
 # CONFIG_TCM_QLA2XXX_DEBUG is not set
 CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_DC395x=m
@@ -2521,10 +2695,15 @@ CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_PMCRAID=m
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_VIRTIO=y
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
 CONFIG_SCSI_DH=y
 CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
@@ -2544,20 +2723,20 @@ CONFIG_SATA_PMP=y
 #
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_MOBILE_LPM_POLICY=0
-CONFIG_SATA_AHCI_PLATFORM=y
-# CONFIG_AHCI_BRCM is not set
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_BRCM=m
 CONFIG_AHCI_IMX=m
-# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MTK=m
-CONFIG_AHCI_MVEBU=y
-CONFIG_AHCI_SUNXI=y
-# CONFIG_AHCI_TEGRA is not set
-CONFIG_AHCI_XGENE=y
-# CONFIG_AHCI_QORIQ is not set
-CONFIG_SATA_AHCI_SEATTLE=y
+CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=m
+CONFIG_AHCI_TEGRA=m
+CONFIG_AHCI_XGENE=m
+CONFIG_AHCI_QORIQ=m
+CONFIG_SATA_AHCI_SEATTLE=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=y
+CONFIG_SATA_SIL24=m
 CONFIG_ATA_SFF=y
 
 #
@@ -2571,12 +2750,13 @@ CONFIG_ATA_BMDMA=y
 #
 # SATA SFF controllers with BMDMA
 #
-CONFIG_ATA_PIIX=y
-# CONFIG_SATA_DWC is not set
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_DWC=m
+CONFIG_SATA_DWC_OLD_DMA=y
+# CONFIG_SATA_DWC_DEBUG is not set
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PROMISE=m
-# CONFIG_SATA_RCAR is not set
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIS=m
 CONFIG_SATA_SVW=m
@@ -2612,7 +2792,7 @@ CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_PDC_OLD=m
-# CONFIG_PATA_RADISYS is not set
+CONFIG_PATA_RADISYS=m
 CONFIG_PATA_RDC=m
 CONFIG_PATA_SCH=m
 CONFIG_PATA_SERVERWORKS=m
@@ -2630,9 +2810,10 @@ CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_MPIIX=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_PLATFORM=y
-CONFIG_PATA_OF_PLATFORM=y
-# CONFIG_PATA_RZ1000 is not set
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PLATFORM=m
+# CONFIG_PATA_OF_PLATFORM is not set
+CONFIG_PATA_RZ1000=m
 
 #
 # Generic fallback / legacy drivers
@@ -2641,8 +2822,7 @@ CONFIG_PATA_OF_PLATFORM=y
 CONFIG_ATA_GENERIC=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
+CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
@@ -2650,36 +2830,35 @@ CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
+CONFIG_MD_CLUSTER=m
 CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_DM_DEBUG=y
-CONFIG_DM_BUFIO=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
 # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_UNSTRIPED is not set
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
-# CONFIG_DM_WRITECACHE is not set
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=y
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
+CONFIG_DM_MIRROR=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=y
+CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_DUST=m
-CONFIG_DM_INIT=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2697,12 +2876,24 @@ CONFIG_TCM_USER2=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
-# CONFIG_FUSION is not set
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
 # end of IEEE 1394 (FireWire) support
 
@@ -2724,15 +2915,16 @@ CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_IPVLAN_L3S=y
 CONFIG_IPVLAN=m
-# CONFIG_IPVTAP is not set
+CONFIG_IPVTAP=m
 CONFIG_VXLAN=m
 CONFIG_GENEVE=m
-# CONFIG_GTP is not set
-# CONFIG_MACSEC is not set
+CONFIG_GTP=m
+CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
 CONFIG_RIONET=m
 CONFIG_RIONET_TX_SIZE=128
 CONFIG_RIONET_RX_SIZE=128
@@ -2743,27 +2935,63 @@ CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
 CONFIG_NLMON=m
 CONFIG_NET_VRF=m
-# CONFIG_VSOCKMON is not set
+CONFIG_VSOCKMON=m
+CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
-# CONFIG_ATM_DRIVERS is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+CONFIG_ATM_ENI_TUNE_BURST=y
+CONFIG_ATM_ENI_BURST_TX_16W=y
+CONFIG_ATM_ENI_BURST_TX_8W=y
+CONFIG_ATM_ENI_BURST_TX_4W=y
+CONFIG_ATM_ENI_BURST_TX_2W=y
+CONFIG_ATM_ENI_BURST_RX_16W=y
+CONFIG_ATM_ENI_BURST_RX_8W=y
+CONFIG_ATM_ENI_BURST_RX_4W=y
+CONFIG_ATM_ENI_BURST_RX_2W=y
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
 
 #
 # CAIF transport drivers
 #
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_SPI_SLAVE=m
+# CONFIG_CAIF_SPI_SYNC is not set
+CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
 
 #
 # Distributed Switch Architecture drivers
 #
 CONFIG_B53=m
-# CONFIG_B53_SPI_DRIVER is not set
-# CONFIG_B53_MDIO_DRIVER is not set
-# CONFIG_B53_MMAP_DRIVER is not set
-# CONFIG_B53_SRAB_DRIVER is not set
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
 CONFIG_B53_SERDES=m
 CONFIG_NET_DSA_BCM_SF2=m
-# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA_LANTIQ_GSWIP=m
-# CONFIG_NET_DSA_MT7530 is not set
+CONFIG_NET_DSA_MT7530=m
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -2773,22 +3001,29 @@ CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
 CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
 CONFIG_NET_DSA_SJA1105=m
-# CONFIG_NET_DSA_SJA1105_PTP is not set
-# CONFIG_NET_DSA_SJA1105_TAS is not set
+CONFIG_NET_DSA_SJA1105_PTP=y
+CONFIG_NET_DSA_SJA1105_TAS=y
 CONFIG_NET_DSA_QCA8K=m
-# CONFIG_NET_DSA_REALTEK_SMI is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+CONFIG_NET_DSA_REALTEK_SMI=m
+CONFIG_NET_DSA_SMSC_LAN9303=m
+CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
+CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
 # end of Distributed Switch Architecture drivers
 
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
 CONFIG_NET_VENDOR_ALACRITECH=y
@@ -2798,12 +3033,13 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
+# CONFIG_ALTERA_TSE is not set
 CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_ENA_ETHERNET=m
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
 CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_DCB=y
 CONFIG_NET_XGENE=y
@@ -2811,15 +3047,15 @@ CONFIG_NET_XGENE_V2=y
 CONFIG_NET_VENDOR_AQUANTIA=y
 CONFIG_AQTION=m
 CONFIG_NET_VENDOR_ARC=y
-CONFIG_ARC_EMAC_CORE=m
-CONFIG_EMAC_ROCKCHIP=m
+# CONFIG_EMAC_ROCKCHIP is not set
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
-# CONFIG_NET_VENDOR_AURORA is not set
+CONFIG_NET_VENDOR_AURORA=y
+CONFIG_AURORA_NB8800=m
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2832,47 +3068,92 @@ CONFIG_TIGON3=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
-CONFIG_BGMAC=y
-CONFIG_BGMAC_PLATFORM=y
-# CONFIG_SYSTEMPORT is not set
-# CONFIG_BNXT is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
+CONFIG_BGMAC=m
+CONFIG_BGMAC_PLATFORM=m
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_DCB=y
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MACB_PCI=m
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
 CONFIG_NET_VENDOR_CORTINA=y
-# CONFIG_GEMINI_ETHERNET is not set
+CONFIG_GEMINI_ETHERNET=m
 CONFIG_DNET=m
-# CONFIG_NET_VENDOR_DEC is not set
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_DL2K=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC=m
-# CONFIG_FSL_FMAN is not set
+CONFIG_FSL_FMAN=m
 CONFIG_DPAA_ERRATUM_A050385=y
-# CONFIG_FSL_PQ_MDIO is not set
-# CONFIG_FSL_XGMAC_MDIO is not set
-# CONFIG_GIANFAR is not set
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_FSL_XGMAC_MDIO=m
+CONFIG_GIANFAR=m
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
 CONFIG_FSL_ENETC=m
 CONFIG_FSL_ENETC_VF=m
-# CONFIG_FSL_ENETC_MDIO is not set
+CONFIG_FSL_ENETC_MDIO=m
 CONFIG_FSL_ENETC_PTP_CLOCK=m
 # CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
+CONFIG_GVE=m
 CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_HIX5HD2_GMAC=m
-# CONFIG_HISI_FEMAC is not set
+CONFIG_HISI_FEMAC=m
 CONFIG_HIP04_ETH=m
-# CONFIG_HI13X1_GMAC is not set
+CONFIG_HI13X1_GMAC=y
 CONFIG_HNS_MDIO=m
 CONFIG_HNS=m
 CONFIG_HNS_DSAF=m
@@ -2880,12 +3161,13 @@ CONFIG_HNS_ENET=m
 CONFIG_HNS3=m
 CONFIG_HNS3_HCLGE=m
 CONFIG_HNS3_DCB=y
-# CONFIG_HNS3_HCLGEVF is not set
+CONFIG_HNS3_HCLGEVF=m
 CONFIG_HNS3_ENET=m
-# CONFIG_NET_VENDOR_HP is not set
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
-# CONFIG_HINIC is not set
-# CONFIG_NET_VENDOR_I825XX is not set
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E100=m
 CONFIG_E1000=m
@@ -2897,19 +3179,21 @@ CONFIG_IXGB=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
 CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
 CONFIG_I40E=m
-# CONFIG_I40E_DCB is not set
+CONFIG_I40E_DCB=y
 CONFIG_IAVF=m
 CONFIG_I40EVF=m
-# CONFIG_ICE is not set
+CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
 CONFIG_MVNETA=m
-# CONFIG_MVPP2 is not set
+CONFIG_MVPP2=m
 # CONFIG_PXA168_ETH is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -2926,20 +3210,46 @@ CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
 CONFIG_MLX4_CORE_GEN2=y
-# CONFIG_MLX5_CORE is not set
-# CONFIG_MLXSW_CORE is not set
-# CONFIG_MLXFW is not set
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+CONFIG_MLX5_FPGA=y
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_CORE_EN_DCB=y
+CONFIG_MLX5_CORE_IPOIB=y
+CONFIG_MLX5_FPGA_IPSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_FPGA_TLS=y
+CONFIG_MLX5_TLS=y
+CONFIG_MLX5_EN_TLS=y
+CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SWITCHIB=m
+CONFIG_MLXSW_SWITCHX2=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
 CONFIG_NET_VENDOR_MICREL=y
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
 CONFIG_KSZ884X_PCI=m
 CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCX24J600 is not set
-# CONFIG_LAN743X is not set
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MICROSEMI=y
-# CONFIG_MSCC_OCELOT_SWITCH is not set
+CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
@@ -2947,14 +3257,20 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETERION=y
-# CONFIG_S2IO is not set
-# CONFIG_VXGE is not set
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_NET_VENDOR_NETRONOME=y
-# CONFIG_NFP is not set
+CONFIG_NFP=m
+CONFIG_NFP_APP_FLOWER=y
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
 CONFIG_NET_VENDOR_NI=y
 CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
@@ -2964,8 +3280,27 @@ CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_NET_VENDOR_PENSANDO=y
 CONFIG_IONIC=m
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCA7000=m
+CONFIG_QCA7000_SPI=m
+CONFIG_QCA7000_UART=m
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_REALTEK=y
@@ -2976,13 +3311,18 @@ CONFIG_8139TOO=m
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
-# CONFIG_NET_VENDOR_RENESAS is not set
+CONFIG_NET_VENDOR_RENESAS=y
 CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_ROCKER=m
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
 CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 CONFIG_NET_VENDOR_SILAN=y
@@ -2992,28 +3332,32 @@ CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
+CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
-# CONFIG_SNI_AVE is not set
-# CONFIG_SNI_NETSEC is not set
+CONFIG_SNI_NETSEC=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
-# CONFIG_DWMAC_DWC_QOS_ETH is not set
+CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MEDIATEK=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_QCOM_ETHQOS=m
 CONFIG_DWMAC_ROCKCHIP=m
-# CONFIG_DWMAC_SOCFPGA is not set
+CONFIG_DWMAC_SOCFPGA=m
 CONFIG_DWMAC_SUNXI=m
 CONFIG_DWMAC_SUN8I=m
-# CONFIG_STMMAC_PCI is not set
-# CONFIG_NET_VENDOR_SUN is not set
+CONFIG_STMMAC_PCI=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
 CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_DWC_XLGMAC=m
 CONFIG_DWC_XLGMAC_PCI=m
@@ -3021,32 +3365,47 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-# CONFIG_TLAN is not set
+CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_VELOCITY=m
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=y
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=m
+CONFIG_DEFXX=m
+CONFIG_DEFXX_MMIO=y
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+# CONFIG_NET_SB1000 is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_BUS=y
 # CONFIG_MDIO_BCM_IPROC is not set
 CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_BUS_MUX=y
-CONFIG_MDIO_BUS_MUX_BCM_IPROC=y
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_BCM_IPROC=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MESON_G12A=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=y
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
-# CONFIG_MDIO_GPIO is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-# CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_SUN4I is not set
-# CONFIG_MDIO_THUNDER is not set
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MSCC_MIIM=m
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_SUN4I=m
+CONFIG_MDIO_THUNDER=m
 CONFIG_MDIO_XGENE=y
 CONFIG_PHYLINK=m
 CONFIG_PHYLIB=y
@@ -3056,8 +3415,8 @@ CONFIG_LED_TRIGGER_PHY=y
 #
 # MII PHY device drivers
 #
-# CONFIG_SFP is not set
-# CONFIG_ADIN_PHY is not set
+CONFIG_SFP=m
+CONFIG_ADIN_PHY=m
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AX88796B_PHY=m
@@ -3070,7 +3429,7 @@ CONFIG_CICADA_PHY=m
 CONFIG_CORTINA_PHY=m
 CONFIG_DAVICOM_PHY=m
 CONFIG_DP83822_PHY=m
-# CONFIG_DP83TC811_PHY is not set
+CONFIG_DP83TC811_PHY=m
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
 CONFIG_FIXED_PHY=y
@@ -3080,13 +3439,13 @@ CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
-CONFIG_MESON_GXL_PHY=y
+CONFIG_MESON_GXL_PHY=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
-# CONFIG_MICROCHIP_T1_PHY is not set
+CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
-# CONFIG_NXP_TJA11XX_PHY is not set
+CONFIG_NXP_TJA11XX_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3096,7 +3455,8 @@ CONFIG_STE10XP=m
 CONFIG_TERANETICS_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_MICREL_KS8995MA is not set
+CONFIG_MICREL_KS8995MA=m
+CONFIG_PLIP=m
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
@@ -3113,8 +3473,12 @@ CONFIG_SLIP=m
 CONFIG_SLHC=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_USB_NET_DRIVERS=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
@@ -3153,72 +3517,70 @@ CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_NET_QMI_WWAN=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_USB_NET_AQC111=m
 CONFIG_WLAN=y
-CONFIG_WIRELESS_WDS=y
+# CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
 CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
-CONFIG_ATH5K_DEBUG=y
+# CONFIG_ATH5K_DEBUG is not set
 # CONFIG_ATH5K_TRACER is not set
 CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_COMMON_DEBUG=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_DEBUGFS=y
-# CONFIG_ATH9K_STATION_STATISTICS is not set
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
 # CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
+CONFIG_ATH9K_WOW=y
 CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
 CONFIG_ATH9K_PCOEM=y
 CONFIG_ATH9K_PCI_NO_EEPROM=m
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_ATH9K_HWRNG=y
-# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 # CONFIG_CARL9170_DEBUGFS is not set
 CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
+CONFIG_CARL9170_HWRNG=y
 CONFIG_ATH6KL=m
 CONFIG_ATH6KL_SDIO=m
 CONFIG_ATH6KL_USB=m
-CONFIG_ATH6KL_DEBUG=y
+# CONFIG_ATH6KL_DEBUG is not set
 # CONFIG_ATH6KL_TRACING is not set
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_WIL6210_DEBUGFS=y
+CONFIG_WIL6210_TRACING=y
+# CONFIG_WIL6210_DEBUGFS is not set
 CONFIG_ATH10K=m
 CONFIG_ATH10K_CE=y
 CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_AHB is not set
-# CONFIG_ATH10K_SDIO is not set
+CONFIG_ATH10K_AHB=y
+CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_USB=m
-# CONFIG_ATH10K_SNOC is not set
+CONFIG_ATH10K_SNOC=m
 # CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_SPECTRAL is not set
+# CONFIG_ATH10K_DEBUGFS is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
 CONFIG_AT76C50X_USB=m
 CONFIG_WLAN_VENDOR_BROADCOM=y
 CONFIG_B43=m
@@ -3238,13 +3600,13 @@ CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_HT=y
 CONFIG_B43_LEDS=y
 CONFIG_B43_HWRNG=y
-CONFIG_B43_DEBUG=y
+# CONFIG_B43_DEBUG is not set
 CONFIG_B43LEGACY=m
 CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 CONFIG_B43LEGACY_LEDS=y
 CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -3261,18 +3623,19 @@ CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
 CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO_CS=m
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_DEBUG=y
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
+CONFIG_IPW2200_DEBUG=y
 CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_LIBIPW_DEBUG=y
 CONFIG_IWLEGACY=m
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
@@ -3280,8 +3643,8 @@ CONFIG_IWL3945=m
 #
 # iwl3945 / iwl4965 Debugging Options
 #
-CONFIG_IWLEGACY_DEBUG=y
-CONFIG_IWLEGACY_DEBUGFS=y
+# CONFIG_IWLEGACY_DEBUG is not set
+# CONFIG_IWLEGACY_DEBUGFS is not set
 # end of iwl3945 / iwl4965 Debugging Options
 
 CONFIG_IWLWIFI=m
@@ -3302,9 +3665,10 @@ CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
 CONFIG_HERMES=m
 CONFIG_HERMES_PRISM=y
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
@@ -3312,6 +3676,8 @@ CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_NORTEL_HERMES=m
 CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
@@ -3322,6 +3688,7 @@ CONFIG_PRISM54=m
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 # CONFIG_LIBERTAS_SPI is not set
 # CONFIG_LIBERTAS_DEBUG is not set
@@ -3345,7 +3712,7 @@ CONFIG_MT76x0_COMMON=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x2_COMMON=m
-# CONFIG_MT76x2E is not set
+CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
 CONFIG_MT7615E=m
@@ -3377,7 +3744,7 @@ CONFIG_RT2X00_LIB=m
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB_DEBUGFS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_RTL8180=m
@@ -3401,7 +3768,7 @@ CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
-# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTW88=m
 CONFIG_RTW88_CORE=m
 CONFIG_RTW88_PCI=m
@@ -3411,7 +3778,7 @@ CONFIG_RTW88_8822CE=y
 # CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
 CONFIG_RSI_COEX=y
@@ -3421,14 +3788,14 @@ CONFIG_CW1200_WLAN_SDIO=m
 # CONFIG_CW1200_WLAN_SPI is not set
 CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
+# CONFIG_WL1251_SPI is not set
 CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE=m
-CONFIG_WLCORE_SPI=m
+# CONFIG_WLCORE_SPI is not set
 CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
+# CONFIG_WILINK_PLATFORM_DATA is not set
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
@@ -3436,27 +3803,35 @@ CONFIG_ZD1211RW=m
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_QTNFMAC=m
 CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
 CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_VIRT_WIFI=m
 
 #
-# Enable WiMAX (Networking options) to see the WiMAX drivers
+# WiMAX Wireless Broadband devices
 #
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
 # CONFIG_IEEE802154_AT86RF230 is not set
 # CONFIG_IEEE802154_MRF24J40 is not set
 # CONFIG_IEEE802154_CC2520 is not set
-CONFIG_IEEE802154_ATUSB=m
-# CONFIG_IEEE802154_ADF7242 is not set
+# CONFIG_IEEE802154_ATUSB is not set
+CONFIG_IEEE802154_ADF7242=m
 CONFIG_IEEE802154_CA8210=m
-# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
-# CONFIG_IEEE802154_MCR20A is not set
+CONFIG_IEEE802154_CA8210_DEBUGFS=y
+CONFIG_IEEE802154_MCR20A=m
 CONFIG_IEEE802154_HWSIM=m
+CONFIG_VMXNET3=m
 # CONFIG_FUJITSU_ES is not set
-# CONFIG_NETDEVSIM is not set
+CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set
@@ -3469,13 +3844,13 @@ CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=y
+CONFIG_INPUT_MATRIXKMAP=m
 
 #
 # Userland interfaces
 #
 CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
@@ -3487,38 +3862,38 @@ CONFIG_INPUT_EVDEV=y
 #
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_QT1050=m
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
 CONFIG_KEYBOARD_SNVS_PWRKEY=m
 CONFIG_KEYBOARD_IMX=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_TEGRA is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_KEYBOARD_OPENCORES=m
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_SUN4I_LRADC is not set
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_SUN4I_LRADC=m
 # CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_CROS_EC=y
-# CONFIG_KEYBOARD_CAP11XX is not set
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_KEYBOARD_CAP11XX=m
 # CONFIG_KEYBOARD_BCM is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
@@ -3532,7 +3907,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
 CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_TOUCHKIT=y
 CONFIG_MOUSE_PS2_FOCALTECH=y
 CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_MOUSE_SERIAL=m
@@ -3543,7 +3918,7 @@ CONFIG_MOUSE_ELAN_I2C=m
 CONFIG_MOUSE_ELAN_I2C_I2C=y
 CONFIG_MOUSE_ELAN_I2C_SMBUS=y
 CONFIG_MOUSE_VSXXXAA=m
-# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_GPIO=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_INPUT_JOYSTICK=y
@@ -3568,13 +3943,18 @@ CONFIG_JOYSTICK_SPACEBALL=m
 CONFIG_JOYSTICK_STINGER=m
 CONFIG_JOYSTICK_TWIDJOY=m
 CONFIG_JOYSTICK_ZHENHUA=m
-# CONFIG_JOYSTICK_AS5011 is not set
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_JOYSTICK_PSXPAD_SPI=m
+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
+CONFIG_JOYSTICK_PXRC=m
 CONFIG_JOYSTICK_FSIA6B=m
 CONFIG_INPUT_TABLET=y
 CONFIG_TABLET_USB_ACECAD=m
@@ -3586,43 +3966,49 @@ CONFIG_TABLET_USB_PEGASUS=m
 CONFIG_TABLET_SERIAL_WACOM4=m
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_PROPERTIES=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
+CONFIG_TOUCHSCREEN_ADS7846=m
 # CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 CONFIG_TOUCHSCREEN_ADC=m
-# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
+CONFIG_TOUCHSCREEN_AR1021_I2C=m
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT_T37=y
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-# CONFIG_TOUCHSCREEN_BU21013 is not set
+CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_BU21029=m
-# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
-# CONFIG_TOUCHSCREEN_CHIPONE_ICN8505 is not set
-# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP4_SPI is not set
 CONFIG_TOUCHSCREEN_DYNAPRO=m
-# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
-# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
 CONFIG_TOUCHSCREEN_EXC3000=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
-# CONFIG_TOUCHSCREEN_GOODIX is not set
+CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_HIDEEP=m
 CONFIG_TOUCHSCREEN_ILI210X=m
-# CONFIG_TOUCHSCREEN_IPROC is not set
+CONFIG_TOUCHSCREEN_IPROC=m
 CONFIG_TOUCHSCREEN_S6SY761=m
 CONFIG_TOUCHSCREEN_GUNZE=m
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
+CONFIG_TOUCHSCREEN_EKTF2127=m
 CONFIG_TOUCHSCREEN_ELAN=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WACOM_I2C=m
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
+CONFIG_TOUCHSCREEN_MAX11801=m
 CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MMS114=m
-# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
+CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
 CONFIG_TOUCHSCREEN_INEXIO=m
@@ -3632,9 +4018,13 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
+# CONFIG_TOUCHSCREEN_TI_AM335X_TSC is not set
 CONFIG_TOUCHSCREEN_PIXCIR=m
-# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
-# CONFIG_TOUCHSCREEN_WM97XX is not set
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -3656,39 +4046,42 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
-# CONFIG_TOUCHSCREEN_TSC2004 is not set
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
-# CONFIG_TOUCHSCREEN_RM_TS is not set
-# CONFIG_TOUCHSCREEN_SILEAD is not set
-# CONFIG_TOUCHSCREEN_SIS_I2C is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
-# CONFIG_TOUCHSCREEN_STMFTS is not set
-# CONFIG_TOUCHSCREEN_SUN4I is not set
-# CONFIG_TOUCHSCREEN_SUR40 is not set
+CONFIG_TOUCHSCREEN_STMFTS=m
+CONFIG_TOUCHSCREEN_SUN4I=m
+CONFIG_TOUCHSCREEN_SUR40=m
 # CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
-# CONFIG_TOUCHSCREEN_SX8654 is not set
-# CONFIG_TOUCHSCREEN_TPS6507X is not set
-# CONFIG_TOUCHSCREEN_ZET6223 is not set
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
-# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
-# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_AD714X is not set
-# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BMA150 is not set
-CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+# CONFIG_INPUT_AD714X_SPI is not set
+CONFIG_INPUT_ATMEL_CAPTOUCH=m
+CONFIG_INPUT_BMA150=m
+# CONFIG_INPUT_E3X0_BUTTON is not set
 CONFIG_INPUT_MSM_VIBRATOR=m
-CONFIG_INPUT_PM8941_PWRKEY=y
-# CONFIG_INPUT_PM8XXX_VIBRATOR is not set
+CONFIG_INPUT_PM8941_PWRKEY=m
+CONFIG_INPUT_PM8XXX_VIBRATOR=m
 CONFIG_INPUT_MAX77650_ONKEY=m
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
-# CONFIG_INPUT_GPIO_DECODER is not set
+CONFIG_INPUT_GPIO_DECODER=m
 CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_CPCAP_PWRBUTTON=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_KXTJ9=m
@@ -3696,54 +4089,58 @@ CONFIG_INPUT_KXTJ9=m
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
-# CONFIG_INPUT_REGULATOR_HAPTIC is not set
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_UINPUT=m
-# CONFIG_INPUT_PCF8574 is not set
+CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_PWM_VIBRA=m
-# CONFIG_INPUT_RK805_PWRKEY is not set
+CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-# CONFIG_INPUT_ADXL34X is not set
-# CONFIG_INPUT_IMS_PCU is not set
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-# CONFIG_INPUT_DRV260X_HAPTICS is not set
-# CONFIG_INPUT_DRV2665_HAPTICS is not set
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-CONFIG_INPUT_HISI_POWERKEY=y
-# CONFIG_INPUT_SC27XX_VIBRA is not set
-# CONFIG_INPUT_STPMIC1_ONKEY is not set
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_HISI_POWERKEY=m
+CONFIG_INPUT_SC27XX_VIBRA=m
+CONFIG_INPUT_STPMIC1_ONKEY=m
 CONFIG_RMI4_CORE=m
-# CONFIG_RMI4_I2C is not set
-# CONFIG_RMI4_SPI is not set
-# CONFIG_RMI4_SMB is not set
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
 CONFIG_RMI4_F03=y
 CONFIG_RMI4_F03_SERIO=m
 CONFIG_RMI4_2D_SENSOR=y
 CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_F55 is not set
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F54=y
+CONFIG_RMI4_F55=y
 
 #
 # Hardware I/O ports
 #
 CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_AMBAKMI=y
-# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_PARKBD=m
+# CONFIG_SERIO_AMBAKMI is not set
+CONFIG_SERIO_PCIPS2=m
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
-# CONFIG_SERIO_PS2MULT is not set
-CONFIG_SERIO_ARC_PS2=m
-# CONFIG_SERIO_APBPS2 is not set
+CONFIG_SERIO_PS2MULT=m
+# CONFIG_SERIO_ARC_PS2 is not set
+CONFIG_SERIO_APBPS2=m
 # CONFIG_SERIO_SUN4I_PS2 is not set
 CONFIG_SERIO_GPIO_PS2=m
-# CONFIG_USERIO is not set
+CONFIG_USERIO=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -3763,20 +4160,22 @@ CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=0
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_ROCKETPORT=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
 CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m
 CONFIG_NOZOMI=m
-# CONFIG_ISI is not set
+CONFIG_ISI=m
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
-# CONFIG_TRACE_SINK is not set
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
 CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
@@ -3793,30 +4192,31 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
 # CONFIG_SERIAL_8250_ASPEED_VUART is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
+# CONFIG_SERIAL_8250_RSA is not set
 CONFIG_SERIAL_8250_DWLIB=y
 CONFIG_SERIAL_8250_BCM2835AUX=y
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_MT6577 is not set
-# CONFIG_SERIAL_8250_UNIPHIER is not set
+CONFIG_SERIAL_8250_MT6577=y
 CONFIG_SERIAL_OF_PLATFORM=y
 
 #
 # Non-8250 serial port support
 #
-# CONFIG_SERIAL_AMBA_PL010 is not set
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
+# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
 # CONFIG_SERIAL_KGDB_NMI is not set
 CONFIG_SERIAL_MESON=y
 CONFIG_SERIAL_MESON_CONSOLE=y
@@ -3824,87 +4224,113 @@ CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 CONFIG_SERIAL_SAMSUNG_UARTS=4
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_TEGRA_TCU=m
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_IMX=m
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
 # CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIAL_SH_SCI is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_CONSOLE_POLL=y
 CONFIG_SERIAL_JSM=m
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SERIAL_SIFIVE=m
+CONFIG_SERIAL_QCOM_GENI=y
+CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
+# CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
+CONFIG_SERIAL_SC16IS7XX_CORE=m
+CONFIG_SERIAL_SC16IS7XX=m
+CONFIG_SERIAL_SC16IS7XX_I2C=y
+CONFIG_SERIAL_SC16IS7XX_SPI=y
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-CONFIG_SERIAL_FSL_LINFLEXUART=m
+# CONFIG_SERIAL_ARC is not set
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_FSL_LINFLEXUART=y
+CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# CONFIG_SERIAL_SPRD is not set
+CONFIG_SERIAL_SPRD=y
+CONFIG_SERIAL_SPRD_CONSOLE=y
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_MVEBU_CONSOLE=y
-# CONFIG_SERIAL_OWL is not set
+CONFIG_SERIAL_OWL=y
+CONFIG_SERIAL_OWL_CONSOLE=y
 # end of Serial drivers
 
 CONFIG_SERIAL_MCTRL_GPIO=y
-# CONFIG_SERIAL_DEV_BUS is not set
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 # CONFIG_TTY_PRINTK is not set
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
 CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
 CONFIG_VIRTIO_CONSOLE=y
-CONFIG_IPMI_HANDLER=y
+CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_DMI_DECODE=y
 CONFIG_IPMI_PLAT_DATA=y
-# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_PANIC_EVENT=y
+# CONFIG_IPMI_PANIC_STRING is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMB_DEVICE_INTERFACE is not set
+CONFIG_IPMB_DEVICE_INTERFACE=m
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_BCM2835=y
-CONFIG_HW_RANDOM_IPROC_RNG200=y
+CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_IPROC_RNG200=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_IMX_RNGC=y
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_IMX_RNGC=m
+CONFIG_HW_RANDOM_HISI=m
 CONFIG_HW_RANDOM_XGENE=m
-CONFIG_HW_RANDOM_MESON=y
-CONFIG_HW_RANDOM_CAVIUM=y
-CONFIG_HW_RANDOM_MTK=y
-CONFIG_HW_RANDOM_EXYNOS=y
-# CONFIG_APPLICOM is not set
-CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=8192
-CONFIG_TCG_TPM=m
+CONFIG_HW_RANDOM_MESON=m
+CONFIG_HW_RANDOM_CAVIUM=m
+CONFIG_HW_RANDOM_MTK=m
+CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_SCR24X=m
+CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=4096
+CONFIG_TCG_TPM=y
 CONFIG_HW_RANDOM_TPM=y
-CONFIG_TCG_TIS_CORE=m
-CONFIG_TCG_TIS=m
-# CONFIG_TCG_TIS_SPI is not set
-# CONFIG_TCG_TIS_I2C_ATMEL is not set
-# CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C_NUVOTON is not set
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
 CONFIG_TCG_ATMEL=m
-# CONFIG_TCG_INFINEON is not set
-# CONFIG_TCG_CRB is not set
-# CONFIG_TCG_VTPM_PROXY is not set
-# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
-# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_CRB=y
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
 CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
@@ -3915,20 +4341,20 @@ CONFIG_DEVPORT=y
 CONFIG_I2C=y
 CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
+# CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=m
 
 #
 # Multiplexer I2C Chip support
 #
-CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
 CONFIG_I2C_MUX_GPIO=m
-# CONFIG_I2C_MUX_GPMUX is not set
-# CONFIG_I2C_MUX_LTC4306 is not set
+CONFIG_I2C_MUX_GPMUX=m
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_PINCTRL=m
+# CONFIG_I2C_MUX_PINCTRL is not set
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
@@ -3946,89 +4372,88 @@ CONFIG_I2C_ALGOPCA=m
 #
 # PC SMBus host controller drivers
 #
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-CONFIG_I2C_AMD_MP2=m
-# CONFIG_I2C_HIX5HD2 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
+# CONFIG_I2C_AMD_MP2 is not set
+CONFIG_I2C_HIX5HD2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
 CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_NVIDIA_GPU=m
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
 # CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
+CONFIG_I2C_VIAPRO=m
 
 #
 # ACPI drivers
 #
-CONFIG_I2C_SCMI=y
+# CONFIG_I2C_SCMI is not set
 
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 CONFIG_I2C_BCM2835=m
-CONFIG_I2C_BCM_IPROC=y
-CONFIG_I2C_BRCMSTB=y
-# CONFIG_I2C_CADENCE is not set
-# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_BCM_IPROC=m
+CONFIG_I2C_BRCMSTB=m
+CONFIG_I2C_CADENCE=m
+CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
-# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DESIGNWARE_PCI=m
 # CONFIG_I2C_EMEV2 is not set
-CONFIG_I2C_EXYNOS5=y
+# CONFIG_I2C_EXYNOS5 is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-# CONFIG_I2C_IMX is not set
+CONFIG_I2C_IMX=m
 CONFIG_I2C_IMX_LPI2C=m
-CONFIG_I2C_MESON=y
-CONFIG_I2C_MT65XX=y
-CONFIG_I2C_MV64XXX=y
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_MESON=m
+CONFIG_I2C_MT65XX=m
+CONFIG_I2C_MV64XXX=m
 # CONFIG_I2C_NOMADIK is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_OWL is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_OWL=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_PXA=m
 # CONFIG_I2C_PXA_SLAVE is not set
-CONFIG_I2C_QUP=y
-# CONFIG_I2C_RIIC is not set
-CONFIG_I2C_RK3X=y
-# CONFIG_I2C_SH_MOBILE is not set
-CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_QCOM_GENI=m
+CONFIG_I2C_QUP=m
+CONFIG_I2C_RK3X=m
+# CONFIG_I2C_SIMTEC is not set
 CONFIG_I2C_SPRD=y
-# CONFIG_I2C_SYNQUACER is not set
-# CONFIG_I2C_TEGRA is not set
-# CONFIG_I2C_TEGRA_BPMP is not set
-# CONFIG_I2C_UNIPHIER is not set
-# CONFIG_I2C_UNIPHIER_F is not set
-CONFIG_I2C_VERSATILE=m
-# CONFIG_I2C_THUNDERX is not set
-# CONFIG_I2C_XILINX is not set
-# CONFIG_I2C_XLP9XX is not set
-# CONFIG_I2C_RCAR is not set
+CONFIG_I2C_SYNQUACER=m
+CONFIG_I2C_TEGRA=m
+CONFIG_I2C_TEGRA_BPMP=m
+# CONFIG_I2C_VERSATILE is not set
+CONFIG_I2C_THUNDERX=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_XLP9XX=m
 
 #
 # External I2C/SMBus adapter drivers
 #
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
 CONFIG_I2C_TINY_USB=m
 CONFIG_I2C_VIPERBOARD=m
 
 #
 # Other I2C/SMBus bus drivers
 #
-CONFIG_I2C_CROS_EC_TUNNEL=y
+CONFIG_I2C_CROS_EC_TUNNEL=m
 CONFIG_I2C_XGENE_SLIMPRO=m
-CONFIG_I2C_ZX2967=y
+CONFIG_I2C_ZX2967=m
 # end of I2C Hardware Bus support
 
 CONFIG_I2C_STUB=m
@@ -4055,60 +4480,75 @@ CONFIG_SPI_ARMADA_3700=m
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_BCM2835AUX=m
-CONFIG_SPI_BCM_QSPI=y
-CONFIG_SPI_BITBANG=y
-# CONFIG_SPI_CADENCE is not set
-# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_BCM_QSPI=m
+CONFIG_SPI_BITBANG=m
+# CONFIG_SPI_BUTTERFLY is not set
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
+# CONFIG_SPI_DW_MID_DMA is not set
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
 CONFIG_SPI_FSL_LPSPI=m
-# CONFIG_SPI_FSL_QUADSPI is not set
+CONFIG_SPI_FSL_QUADSPI=m
 CONFIG_SPI_NXP_FLEXSPI=m
-CONFIG_SPI_GPIO=y
+CONFIG_SPI_GPIO=m
 CONFIG_SPI_IMX=m
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_FSL_DSPI is not set
-# CONFIG_SPI_MESON_SPICC is not set
-CONFIG_SPI_MESON_SPIFC=y
-CONFIG_SPI_MT65XX=y
-# CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_ORION=y
-CONFIG_SPI_PL022=y
+# CONFIG_SPI_LM70_LLP is not set
+CONFIG_SPI_FSL_LIB=y
+CONFIG_SPI_FSL_SPI=y
+CONFIG_SPI_FSL_DSPI=m
+CONFIG_SPI_MESON_SPICC=m
+# CONFIG_SPI_MESON_SPIFC is not set
+CONFIG_SPI_MT65XX=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_ORION=m
+CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_RSPI is not set
+CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_QCOM_QSPI=m
-CONFIG_SPI_QUP=y
-# CONFIG_SPI_S3C64XX is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SH_MSIOF is not set
-# CONFIG_SPI_SH_HSPI is not set
+CONFIG_SPI_QUP=m
+CONFIG_SPI_QCOM_GENI=m
+CONFIG_SPI_S3C64XX=m
+CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_SLAVE_MT27XX=m
 CONFIG_SPI_SPRD=m
 CONFIG_SPI_SPRD_ADI=m
-# CONFIG_SPI_SUN4I is not set
-# CONFIG_SPI_SUN6I is not set
-# CONFIG_SPI_SYNQUACER is not set
+CONFIG_SPI_SUN4I=m
+CONFIG_SPI_SUN6I=m
+CONFIG_SPI_SYNQUACER=m
 CONFIG_SPI_MXIC=m
-# CONFIG_SPI_TEGRA114 is not set
-# CONFIG_SPI_TEGRA20_SFLASH is not set
-# CONFIG_SPI_TEGRA20_SLINK is not set
-# CONFIG_SPI_THUNDERX is not set
-# CONFIG_SPI_UNIPHIER is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_XLP is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
+CONFIG_SPI_TEGRA20_SFLASH=m
+CONFIG_SPI_THUNDERX=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_XILINX=m
+CONFIG_SPI_XLP=m
+CONFIG_SPI_ZYNQMP_GQSPI=m
 
 #
 # SPI Protocol Masters
 #
 CONFIG_SPI_SPIDEV=m
-# CONFIG_SPI_LOOPBACK_TEST is not set
+CONFIG_SPI_LOOPBACK_TEST=m
 # CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_SLAVE is not set
-CONFIG_SPMI=y
-CONFIG_SPMI_MSM_PMIC_ARB=y
-# CONFIG_HSI is not set
-CONFIG_PPS=m
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_SLAVE_TIME=m
+CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPMI=m
+CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=y
 # CONFIG_PPS_DEBUG is not set
 
 #
@@ -4116,6 +4556,7 @@ CONFIG_PPS=m
 #
 # CONFIG_PPS_CLIENT_KTIMER is not set
 CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
 CONFIG_PPS_CLIENT_GPIO=m
 
 #
@@ -4125,10 +4566,13 @@ CONFIG_PPS_CLIENT_GPIO=m
 #
 # PTP clock support
 #
-CONFIG_PTP_1588_CLOCK=m
+CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_DTE=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
-CONFIG_DP83640_PHY=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
 # end of PTP clock support
 
 CONFIG_PINCTRL=y
@@ -4138,34 +4582,39 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_AXP209=m
+CONFIG_PINCTRL_AMD=m
 CONFIG_PINCTRL_BM1880=y
-# CONFIG_PINCTRL_MCP23S08 is not set
+CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_STMFX=m
-# CONFIG_PINCTRL_RK805 is not set
-CONFIG_PINCTRL_OCELOT=y
-# CONFIG_PINCTRL_OWL is not set
+CONFIG_PINCTRL_MAX77620=m
+CONFIG_PINCTRL_RK805=m
+# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_PINCTRL_OWL=y
+CONFIG_PINCTRL_S700=y
+CONFIG_PINCTRL_S900=y
 CONFIG_PINCTRL_BCM2835=y
 CONFIG_PINCTRL_IPROC_GPIO=y
 CONFIG_PINCTRL_NS2_MUX=y
-# CONFIG_PINCTRL_AS370 is not set
-# CONFIG_PINCTRL_BERLIN_BG4CT is not set
+CONFIG_PINCTRL_BERLIN=y
+CONFIG_PINCTRL_AS370=y
+CONFIG_PINCTRL_BERLIN_BG4CT=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX_SCU=y
-# CONFIG_PINCTRL_IMX8MM is not set
-# CONFIG_PINCTRL_IMX8MN is not set
+CONFIG_PINCTRL_IMX8MM=y
+CONFIG_PINCTRL_IMX8MN=y
 CONFIG_PINCTRL_IMX8MQ=y
-# CONFIG_PINCTRL_IMX8QM is not set
+CONFIG_PINCTRL_IMX8QM=y
 CONFIG_PINCTRL_IMX8QXP=y
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_AP806=y
 CONFIG_PINCTRL_ARMADA_CP110=y
 CONFIG_PINCTRL_ARMADA_37XX=y
 CONFIG_PINCTRL_MSM=y
-CONFIG_PINCTRL_APQ8064=y
+# CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_APQ8084 is not set
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
@@ -4174,29 +4623,23 @@ CONFIG_PINCTRL_APQ8064=y
 # CONFIG_PINCTRL_MSM8960 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
 # CONFIG_PINCTRL_MSM8X74 is not set
-CONFIG_PINCTRL_MSM8916=y
-CONFIG_PINCTRL_MSM8994=m
-CONFIG_PINCTRL_MSM8996=y
-# CONFIG_PINCTRL_MSM8998 is not set
-CONFIG_PINCTRL_QCS404=m
-# CONFIG_PINCTRL_QDF2XXX is not set
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
-CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
+CONFIG_PINCTRL_MSM8916=m
+# CONFIG_PINCTRL_MSM8994 is not set
+# CONFIG_PINCTRL_MSM8996 is not set
+CONFIG_PINCTRL_MSM8998=m
+# CONFIG_PINCTRL_QCS404 is not set
+CONFIG_PINCTRL_QDF2XXX=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
 CONFIG_PINCTRL_SC7180=m
-CONFIG_PINCTRL_SDM660=m
-# CONFIG_PINCTRL_SDM845 is not set
-# CONFIG_PINCTRL_SM8150 is not set
+# CONFIG_PINCTRL_SDM660 is not set
+CONFIG_PINCTRL_SDM845=m
+CONFIG_PINCTRL_SM8150=m
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS_ARM64=y
-CONFIG_PINCTRL_SH_PFC=y
-CONFIG_PINCTRL_PFC_R8A774A1=y
-CONFIG_PINCTRL_PFC_R8A774C0=y
-CONFIG_PINCTRL_PFC_R8A7795=y
-CONFIG_PINCTRL_PFC_R8A7796=y
-CONFIG_PINCTRL_PFC_R8A77970=y
-CONFIG_PINCTRL_PFC_R8A77995=y
-# CONFIG_PINCTRL_SPRD is not set
+CONFIG_PINCTRL_SPRD=y
+CONFIG_PINCTRL_SPRD_SC9860=y
 CONFIG_PINCTRL_SUNXI=y
 # CONFIG_PINCTRL_SUN4I_A10 is not set
 # CONFIG_PINCTRL_SUN5I is not set
@@ -4220,17 +4663,8 @@ CONFIG_PINCTRL_SUN50I_H6_R=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA124=y
 CONFIG_PINCTRL_TEGRA210=y
+CONFIG_PINCTRL_TEGRA194=y
 CONFIG_PINCTRL_TEGRA_XUSB=y
-CONFIG_PINCTRL_UNIPHIER=y
-# CONFIG_PINCTRL_UNIPHIER_LD4 is not set
-# CONFIG_PINCTRL_UNIPHIER_PRO4 is not set
-# CONFIG_PINCTRL_UNIPHIER_SLD8 is not set
-# CONFIG_PINCTRL_UNIPHIER_PRO5 is not set
-# CONFIG_PINCTRL_UNIPHIER_PXS2 is not set
-# CONFIG_PINCTRL_UNIPHIER_LD6B is not set
-CONFIG_PINCTRL_UNIPHIER_LD11=y
-CONFIG_PINCTRL_UNIPHIER_LD20=y
-CONFIG_PINCTRL_UNIPHIER_PXS3=y
 
 #
 # MediaTek pinctrl drivers
@@ -4248,7 +4682,8 @@ CONFIG_PINCTRL_MT8183=y
 CONFIG_PINCTRL_MT8516=y
 # end of MediaTek pinctrl drivers
 
-# CONFIG_PINCTRL_ZX296718 is not set
+CONFIG_PINCTRL_ZX=y
+CONFIG_PINCTRL_ZX296718=y
 CONFIG_PINCTRL_MESON=y
 CONFIG_PINCTRL_MESON_GXBB=y
 CONFIG_PINCTRL_MESON_GXL=y
@@ -4256,10 +4691,13 @@ CONFIG_PINCTRL_MESON8_PMX=y
 CONFIG_PINCTRL_MESON_AXG=y
 CONFIG_PINCTRL_MESON_AXG_PMX=y
 CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_PINCTRL_LOCHNAGAR=m
 CONFIG_PINCTRL_MADERA=m
+CONFIG_PINCTRL_CS47L15=y
 CONFIG_PINCTRL_CS47L35=y
 CONFIG_PINCTRL_CS47L85=y
 CONFIG_PINCTRL_CS47L90=y
+CONFIG_PINCTRL_CS47L92=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
@@ -4268,74 +4706,82 @@ CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_MAX730X=m
 
 #
 # Memory mapped GPIO drivers
 #
-# CONFIG_GPIO_74XX_MMIO is not set
+CONFIG_GPIO_74XX_MMIO=m
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMDPT is not set
-CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_GPIO_BRCMSTB=y
+CONFIG_GPIO_RASPBERRYPI_EXP=m
+CONFIG_GPIO_BRCMSTB=m
 CONFIG_GPIO_CADENCE=m
-CONFIG_GPIO_DWAPB=y
-# CONFIG_GPIO_EIC_SPRD is not set
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EIC_SPRD=m
 # CONFIG_GPIO_EXAR is not set
-# CONFIG_GPIO_FTGPIO010 is not set
+CONFIG_GPIO_FTGPIO010=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_GRGPIO is not set
+CONFIG_GPIO_GRGPIO=m
 # CONFIG_GPIO_HLWD is not set
 CONFIG_GPIO_MB86S7X=m
-# CONFIG_GPIO_MPC8XXX is not set
+CONFIG_GPIO_MPC8XXX=y
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_PL061=y
-# CONFIG_GPIO_PMIC_EIC_SPRD is not set
-# CONFIG_GPIO_RCAR is not set
-CONFIG_GPIO_SAMA5D2_PIOBU=m
-# CONFIG_GPIO_SPRD is not set
+CONFIG_GPIO_PMIC_EIC_SPRD=m
+# CONFIG_GPIO_SAMA5D2_PIOBU is not set
+CONFIG_GPIO_SPRD=m
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_TEGRA=y
-CONFIG_GPIO_TEGRA186=y
+CONFIG_GPIO_TEGRA186=m
 CONFIG_GPIO_THUNDERX=m
-CONFIG_GPIO_UNIPHIER=m
 CONFIG_GPIO_XGENE=y
 CONFIG_GPIO_XGENE_SB=m
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_XLP is not set
-# CONFIG_GPIO_ZYNQ is not set
+CONFIG_GPIO_XILINX=m
+CONFIG_GPIO_XLP=m
+CONFIG_GPIO_ZYNQ=m
 # CONFIG_GPIO_ZX is not set
-CONFIG_GPIO_AMD_FCH=m
+# CONFIG_GPIO_AMD_FCH is not set
 # end of Memory mapped GPIO drivers
 
 #
 # I2C GPIO expanders
 #
-# CONFIG_GPIO_ADP5588 is not set
+CONFIG_GPIO_ADP5588=m
 # CONFIG_GPIO_ADNP is not set
 CONFIG_GPIO_GW_PLD=m
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_PCA953X_IRQ=y
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_TPIC2810 is not set
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
 # end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
 #
+CONFIG_GPIO_BD70528=m
 CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_LP87565=m
 CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77620=m
 CONFIG_GPIO_MAX77650=m
+CONFIG_GPIO_TPS68470=y
 CONFIG_GPIO_TQMX86=m
+# CONFIG_GPIO_WM8994 is not set
 # end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
 #
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
+CONFIG_GPIO_MLXBF=m
+CONFIG_GPIO_PCI_IDIO_16=m
+CONFIG_GPIO_PCIE_IDIO_24=m
 # CONFIG_GPIO_RDC321X is not set
 # end of PCI GPIO expanders
 
@@ -4346,8 +4792,9 @@ CONFIG_GPIO_TQMX86=m
 CONFIG_GPIO_MAX3191X=m
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_XRA1403 is not set
+CONFIG_GPIO_PISOSR=m
+CONFIG_GPIO_XRA1403=m
+CONFIG_GPIO_MOXTET=m
 # end of SPI GPIO expanders
 
 #
@@ -4356,20 +4803,20 @@ CONFIG_GPIO_MAX3191X=m
 CONFIG_GPIO_VIPERBOARD=m
 # end of USB GPIO expanders
 
-# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
 #
 # 1-wire Bus Masters
 #
-# CONFIG_W1_MASTER_MATROX is not set
+CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_MXC=m
 CONFIG_W1_MASTER_DS1WM=m
-# CONFIG_W1_MASTER_GPIO is not set
-CONFIG_W1_MASTER_SGI=m
+CONFIG_W1_MASTER_GPIO=m
+# CONFIG_W1_MASTER_SGI is not set
 # end of 1-wire Bus Masters
 
 #
@@ -4377,9 +4824,9 @@ CONFIG_W1_MASTER_SGI=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
-# CONFIG_W1_SLAVE_DS2405 is not set
+CONFIG_W1_SLAVE_DS2405=m
 CONFIG_W1_SLAVE_DS2408=m
-# CONFIG_W1_SLAVE_DS2408_READBACK is not set
+CONFIG_W1_SLAVE_DS2408_READBACK=y
 CONFIG_W1_SLAVE_DS2413=m
 CONFIG_W1_SLAVE_DS2406=m
 CONFIG_W1_SLAVE_DS2423=m
@@ -4387,7 +4834,7 @@ CONFIG_W1_SLAVE_DS2805=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 CONFIG_W1_SLAVE_DS2433_CRC=y
-# CONFIG_W1_SLAVE_DS2438 is not set
+CONFIG_W1_SLAVE_DS2438=m
 CONFIG_W1_SLAVE_DS250X=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
@@ -4395,65 +4842,75 @@ CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
 # end of 1-wire Slaves
 
-# CONFIG_POWER_AVS is not set
+CONFIG_POWER_AVS=y
+CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_BRCMSTB is not set
+CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_HISI=y
 CONFIG_POWER_RESET_MSM=y
-# CONFIG_POWER_RESET_QCOM_PON is not set
-# CONFIG_POWER_RESET_LTC2952 is not set
+CONFIG_POWER_RESET_QCOM_PON=m
+CONFIG_POWER_RESET_LTC2952=y
 CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-# CONFIG_POWER_RESET_ZX is not set
-CONFIG_REBOOT_MODE=y
-CONFIG_SYSCON_REBOOT_MODE=y
-# CONFIG_POWER_RESET_SC27XX is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
+CONFIG_POWER_RESET_ZX=m
+CONFIG_REBOOT_MODE=m
+CONFIG_SYSCON_REBOOT_MODE=m
+CONFIG_POWER_RESET_SC27XX=y
+CONFIG_NVMEM_REBOOT_MODE=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
-# CONFIG_PDA_POWER is not set
+CONFIG_PDA_POWER=m
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_TEST_POWER is not set
 CONFIG_CHARGER_ADP5061=m
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_LEGO_EV3 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
+CONFIG_BATTERY_CPCAP=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_LEGO_EV3=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
 CONFIG_MANAGER_SBS=m
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
 CONFIG_BATTERY_MAX1721X=m
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_GPIO=m
 # CONFIG_CHARGER_MANAGER is not set
 CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_DETECTOR_MAX14656=m
 CONFIG_CHARGER_MAX77650=m
 CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24190 is not set
-# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ25890=m
 CONFIG_CHARGER_SMB347=m
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_CHARGER_RT9455 is not set
+CONFIG_CHARGER_RT9455=m
 CONFIG_CHARGER_CROS_USBPD=m
-# CONFIG_CHARGER_SC2731 is not set
+CONFIG_CHARGER_SC2731=m
 CONFIG_FUEL_GAUGE_SC27XX=m
 CONFIG_CHARGER_UCS1002=m
+CONFIG_CHARGER_BD70528=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4479,31 +4936,33 @@ CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_AS370=m
 CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_ARM_SCMI=m
 CONFIG_SENSORS_ARM_SCPI=m
-# CONFIG_SENSORS_ASPEED is not set
+CONFIG_SENSORS_ASPEED=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
-# CONFIG_SENSORS_I5K_AMB is not set
+CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
-# CONFIG_SENSORS_FTSTEUTATES is not set
+CONFIG_SENSORS_FTSTEUTATES=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_G762=m
-# CONFIG_SENSORS_GPIO_FAN is not set
-# CONFIG_SENSORS_HIH6130 is not set
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_HIH6130=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IIO_HWMON=m
+# CONFIG_SENSORS_IIO_HWMON is not set
 CONFIG_SENSORS_IT87=m
-# CONFIG_SENSORS_JC42 is not set
+CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_POWR1220=m
 CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LOCHNAGAR=m
 CONFIG_SENSORS_LTC2945=m
-# CONFIG_SENSORS_LTC2990 is not set
+CONFIG_SENSORS_LTC2990=m
 CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4222=m
@@ -4514,16 +4973,18 @@ CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-# CONFIG_SENSORS_MAX31722 is not set
+# CONFIG_SENSORS_MAX197 is not set
+CONFIG_SENSORS_MAX31722=m
 CONFIG_SENSORS_MAX6621=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
-# CONFIG_SENSORS_MAX31790 is not set
+CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MLXREG_FAN=m
 CONFIG_SENSORS_TC654=m
+# CONFIG_SENSORS_MENF21BMC_HWMON is not set
 # CONFIG_SENSORS_ADCXX is not set
 CONFIG_SENSORS_LM63=m
 # CONFIG_SENSORS_LM70 is not set
@@ -4543,7 +5004,7 @@ CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
 CONFIG_SENSORS_NCT6683=m
 CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
@@ -4554,22 +5015,22 @@ CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_IBM_CFFPS=m
+# CONFIG_SENSORS_IBM_CFFPS is not set
 CONFIG_SENSORS_INSPUR_IPSPS=m
-# CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR35221=m
 CONFIG_SENSORS_IR38064=m
-# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_IRPS5401=m
 CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
-# CONFIG_SENSORS_LTC3815 is not set
+CONFIG_SENSORS_LTC3815=m
 CONFIG_SENSORS_MAX16064=m
-# CONFIG_SENSORS_MAX20751 is not set
+CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
-# CONFIG_SENSORS_PXE1610 is not set
+CONFIG_SENSORS_PXE1610=m
 CONFIG_SENSORS_TPS40422=m
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4584,7 +5045,7 @@ CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_EMC1403=m
-# CONFIG_SENSORS_EMC2103 is not set
+CONFIG_SENSORS_EMC2103=m
 CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
@@ -4592,8 +5053,8 @@ CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
-# CONFIG_SENSORS_STTS751 is not set
-# CONFIG_SENSORS_SMM665 is not set
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_ADC128D818=m
 CONFIG_SENSORS_ADS7828=m
 # CONFIG_SENSORS_ADS7871 is not set
@@ -4612,7 +5073,7 @@ CONFIG_SENSORS_VEXPRESS=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_VT8231=m
-# CONFIG_SENSORS_W83773G is not set
+CONFIG_SENSORS_W83773G=m
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
@@ -4623,18 +5084,18 @@ CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
-# CONFIG_SENSORS_XGENE is not set
+CONFIG_SENSORS_XGENE=m
 
 #
 # ACPI drivers
 #
-CONFIG_SENSORS_ACPI_POWER=m
+# CONFIG_SENSORS_ACPI_POWER is not set
 CONFIG_THERMAL=y
-# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -4643,19 +5104,18 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 CONFIG_CPU_THERMAL=y
-# CONFIG_CLOCK_THERMAL is not set
-# CONFIG_DEVFREQ_THERMAL is not set
-CONFIG_THERMAL_EMULATION=y
+CONFIG_CLOCK_THERMAL=y
+CONFIG_DEVFREQ_THERMAL=y
+# CONFIG_THERMAL_EMULATION is not set
 CONFIG_THERMAL_MMIO=m
-CONFIG_HISI_THERMAL=y
+CONFIG_HISI_THERMAL=m
 CONFIG_IMX_THERMAL=m
-# CONFIG_QORIQ_THERMAL is not set
+CONFIG_MAX77620_THERMAL=m
+CONFIG_QORIQ_THERMAL=m
 CONFIG_ROCKCHIP_THERMAL=m
-# CONFIG_RCAR_THERMAL is not set
-# CONFIG_RCAR_GEN3_THERMAL is not set
-# CONFIG_ARMADA_THERMAL is not set
+CONFIG_ARMADA_THERMAL=m
 CONFIG_MTK_THERMAL=m
 
 #
@@ -4664,33 +5124,32 @@ CONFIG_MTK_THERMAL=m
 CONFIG_BCM2835_THERMAL=m
 CONFIG_BRCMSTB_THERMAL=m
 CONFIG_BCM_NS_THERMAL=m
-CONFIG_BCM_SR_THERMAL=y
+CONFIG_BCM_SR_THERMAL=m
 # end of Broadcom thermal drivers
 
 #
 # Samsung thermal drivers
 #
-# CONFIG_EXYNOS_THERMAL is not set
+CONFIG_EXYNOS_THERMAL=m
 # end of Samsung thermal drivers
 
 #
 # NVIDIA Tegra thermal drivers
 #
-# CONFIG_TEGRA_SOCTHERM is not set
+CONFIG_TEGRA_SOCTHERM=m
 CONFIG_TEGRA_BPMP_THERMAL=m
 # end of NVIDIA Tegra thermal drivers
 
-# CONFIG_GENERIC_ADC_THERMAL is not set
+CONFIG_GENERIC_ADC_THERMAL=m
 
 #
 # Qualcomm thermal drivers
 #
-# CONFIG_QCOM_TSENS is not set
-CONFIG_QCOM_SPMI_TEMP_ALARM=y
+CONFIG_QCOM_TSENS=m
+# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
 # end of Qualcomm thermal drivers
 
-# CONFIG_ZX2967_THERMAL is not set
-CONFIG_UNIPHIER_THERMAL=m
+CONFIG_ZX2967_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -4701,46 +5160,54 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 #
 # Watchdog Pretimeout Governors
 #
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
+CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
+# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
 
 #
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_GPIO_WATCHDOG=m
-# CONFIG_WDAT_WDT is not set
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
+CONFIG_BD70528_WATCHDOG=m
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_MENF21BMC_WATCHDOG is not set
+CONFIG_WDAT_WDT=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_MLX_WDT=m
+# CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_ARM_SBSA_WATCHDOG=m
 CONFIG_ARMADA_37XX_WATCHDOG=m
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
 CONFIG_HAVE_S3C2410_WATCHDOG=y
-# CONFIG_S3C2410_WATCHDOG is not set
+CONFIG_S3C2410_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_SUNXI_WATCHDOG=m
 # CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_IMX2_WDT is not set
+CONFIG_MAX77620_WATCHDOG=m
+CONFIG_IMX2_WDT=m
 CONFIG_IMX_SC_WDT=m
 CONFIG_IMX7ULP_WDT=m
-# CONFIG_TEGRA_WATCHDOG is not set
-CONFIG_QCOM_WDT=m
+CONFIG_TEGRA_WATCHDOG=m
+# CONFIG_QCOM_WDT is not set
 CONFIG_MESON_GXBB_WATCHDOG=m
 CONFIG_MESON_WATCHDOG=m
 CONFIG_MEDIATEK_WATCHDOG=m
-# CONFIG_RENESAS_WDT is not set
-# CONFIG_RENESAS_RZAWDT is not set
-# CONFIG_ZX2967_WATCHDOG is not set
+CONFIG_ZX2967_WATCHDOG=m
 CONFIG_STPMIC1_WATCHDOG=m
-# CONFIG_UNIPHIER_WATCHDOG is not set
 CONFIG_RTD119X_WATCHDOG=y
-# CONFIG_SPRD_WATCHDOG is not set
+CONFIG_SPRD_WATCHDOG=m
 CONFIG_PM8916_WATCHDOG=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_I6300ESB_WDT=m
+CONFIG_KEMPLD_WDT=m
 CONFIG_BCM2835_WDT=m
-# CONFIG_BCM7038_WDT is not set
-# CONFIG_MEN_A21_WDT is not set
+CONFIG_BCM7038_WDT=m
+CONFIG_MEN_A21_WDT=m
 
 #
 # PCI-based Watchdog Cards
@@ -4759,6 +5226,8 @@ CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
@@ -4769,8 +5238,9 @@ CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_HOST_SOC=y
 CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
 CONFIG_BCMA_DRIVER_GMAC_CMN=y
 CONFIG_BCMA_DRIVER_GPIO=y
 # CONFIG_BCMA_DEBUG is not set
@@ -4779,7 +5249,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
-# CONFIG_MFD_ALTERA_SYSMGR is not set
+CONFIG_MFD_ALTERA_SYSMGR=y
 # CONFIG_MFD_ACT8945A is not set
 CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_AS3711 is not set
@@ -4787,21 +5257,22 @@ CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
+CONFIG_MFD_ATMEL_HLCDC=m
 # CONFIG_MFD_BCM590XX is not set
 CONFIG_MFD_BD9571MWV=m
-# CONFIG_MFD_AC100 is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
-CONFIG_MFD_CROS_EC_DEV=y
+CONFIG_MFD_AC100=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_AXP20X_RSB=m
+CONFIG_MFD_CROS_EC_DEV=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
-# CONFIG_MFD_CS47L15 is not set
+CONFIG_MFD_CS47L15=y
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
-# CONFIG_MFD_CS47L92 is not set
+CONFIG_MFD_CS47L92=y
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_DA9052_I2C is not set
@@ -4809,23 +5280,23 @@ CONFIG_MFD_CS47L90=y
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_EXYNOS_LPASS is not set
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_MC13XXX_SPI is not set
 # CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_HI655X_PMIC=y
-# CONFIG_HTC_PASIC3 is not set
+CONFIG_MFD_HI6421_PMIC=m
+CONFIG_MFD_HI655X_PMIC=m
+CONFIG_HTC_PASIC3=m
 # CONFIG_HTC_I2CPLD is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
 # CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
+CONFIG_MFD_KEMPLD=m
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77620=y
 CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
@@ -4835,45 +5306,44 @@ CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
+CONFIG_MFD_MENF21BMC=m
 # CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_CPCAP=m
 CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_UCB1400_CORE is not set
-CONFIG_MFD_QCOM_RPM=y
-CONFIG_MFD_SPMI_PMIC=y
+CONFIG_MFD_QCOM_RPM=m
+CONFIG_MFD_SPMI_PMIC=m
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_RC5T583 is not set
-CONFIG_MFD_RK808=y
+CONFIG_MFD_RK808=m
 # CONFIG_MFD_RN5T618 is not set
-CONFIG_MFD_SEC_CORE=y
+# CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_SM501 is not set
+CONFIG_MFD_SKY81452=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_SC27XX_PMIC=m
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
 # CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_TI_LMU is not set
+CONFIG_MFD_TI_LMU=m
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_TPS6105X is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TPS6507X is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TPS68470 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
+CONFIG_MFD_TPS68470=y
+CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TI_LP87565=m
 # CONFIG_MFD_TPS65218 is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
@@ -4883,51 +5353,63 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_TWL6040_CORE is not set
 CONFIG_MFD_WL1273_CORE=m
-# CONFIG_MFD_LM3533 is not set
+CONFIG_MFD_LM3533=m
 # CONFIG_MFD_TC3589X is not set
 CONFIG_MFD_TQMX86=m
 CONFIG_MFD_VX855=m
-# CONFIG_MFD_LOCHNAGAR is not set
+CONFIG_MFD_LOCHNAGAR=y
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
+CONFIG_MFD_WM8994=m
+CONFIG_MFD_ROHM_BD718XX=m
+CONFIG_MFD_ROHM_BD70528=m
 CONFIG_MFD_STPMIC1=m
 CONFIG_MFD_STMFX=m
 CONFIG_MFD_VEXPRESS_SYSREG=y
+# CONFIG_RAVE_SP_CORE is not set
 # end of Multifunction device drivers
 
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_88PG86X is not set
+CONFIG_REGULATOR_88PG86X=m
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_ANATOP is not set
-# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
-# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
-# CONFIG_REGULATOR_BD9571MWV is not set
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BD70528=m
+CONFIG_REGULATOR_BD718XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
-CONFIG_REGULATOR_FAN53555=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_HI655X=y
-# CONFIG_REGULATOR_ISL9305 is not set
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_HI6421V530=m
+CONFIG_REGULATOR_HI655X=m
+CONFIG_REGULATOR_ISL9305=m
 # CONFIG_REGULATOR_ISL6271A is not set
+CONFIG_REGULATOR_LM363X=m
+CONFIG_REGULATOR_LOCHNAGAR=m
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_LP3972 is not set
 # CONFIG_REGULATOR_LP872X is not set
+CONFIG_REGULATOR_LP873X=m
 # CONFIG_REGULATOR_LP8755 is not set
-# CONFIG_REGULATOR_LTC3589 is not set
-# CONFIG_REGULATOR_LTC3676 is not set
+CONFIG_REGULATOR_LP87565=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
 # CONFIG_REGULATOR_MAX1586 is not set
+CONFIG_REGULATOR_MAX77620=m
 CONFIG_REGULATOR_MAX77650=m
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
@@ -4940,30 +5422,30 @@ CONFIG_REGULATOR_MT6380=m
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
-CONFIG_REGULATOR_PWM=y
-CONFIG_REGULATOR_QCOM_RPM=y
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_RPM=m
+CONFIG_REGULATOR_QCOM_RPMH=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
-CONFIG_REGULATOR_QCOM_SPMI=y
-CONFIG_REGULATOR_RK808=y
-# CONFIG_REGULATOR_S2MPA01 is not set
-CONFIG_REGULATOR_S2MPS11=y
-# CONFIG_REGULATOR_S5M8767 is not set
-# CONFIG_REGULATOR_SC2731 is not set
-# CONFIG_REGULATOR_SLG51000 is not set
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_SC2731=m
+CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_SLG51000=m
 CONFIG_REGULATOR_STPMIC1=m
-# CONFIG_REGULATOR_SY8106A is not set
-# CONFIG_REGULATOR_SY8824X is not set
+CONFIG_REGULATOR_SY8106A=m
+CONFIG_REGULATOR_SY8824X=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_TPS65132=m
 # CONFIG_REGULATOR_TPS6524X is not set
-CONFIG_REGULATOR_UNIPHIER=y
-# CONFIG_REGULATOR_VCTRL is not set
-CONFIG_REGULATOR_VEXPRESS=y
+CONFIG_REGULATOR_VCTRL=m
+CONFIG_REGULATOR_VEXPRESS=m
+CONFIG_REGULATOR_WM8994=m
 CONFIG_CEC_CORE=y
 CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_LIRC=y
@@ -4977,22 +5459,22 @@ CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_SHARP_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_XMP_DECODER=m
-# CONFIG_IR_IMON_DECODER is not set
+CONFIG_IR_IMON_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_RC_DEVICES=y
 CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
+# CONFIG_IR_ENE is not set
 CONFIG_IR_HIX5HD2=m
 CONFIG_IR_IMON=m
-# CONFIG_IR_IMON_RAW is not set
+CONFIG_IR_IMON_RAW=m
 CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
+# CONFIG_IR_ITE_CIR is not set
+# CONFIG_IR_FINTEK is not set
 CONFIG_IR_MESON=m
-# CONFIG_IR_MTK is not set
-CONFIG_IR_NUVOTON=m
+CONFIG_IR_MTK=m
+# CONFIG_IR_NUVOTON is not set
 CONFIG_IR_REDRAT3=m
-# CONFIG_IR_SPI is not set
+CONFIG_IR_SPI=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_IGORPLUGUSB=m
 CONFIG_IR_IGUANA=m
@@ -5001,10 +5483,10 @@ CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_IR_GPIO_TX=m
 CONFIG_IR_PWM_TX=m
-# CONFIG_IR_SUNXI is not set
+CONFIG_IR_SUNXI=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
-# CONFIG_IR_SIR is not set
+CONFIG_IR_SIR=m
 CONFIG_RC_XBOX_DVD=m
 CONFIG_IR_ZX=m
 CONFIG_MEDIA_SUPPORT=m
@@ -5018,18 +5500,18 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
+# CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_MEDIA_CONTROLLER_DVB=y
-# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
 CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_V4L2_SUBDEV_API is not set
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_I2C=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
-# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
@@ -5155,7 +5637,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
+CONFIG_DVB_USB_CXUSB_ANALOG=y
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -5186,7 +5668,7 @@ CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_USB_DVBSKY=m
-# CONFIG_DVB_USB_ZD1301 is not set
+CONFIG_DVB_USB_ZD1301=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_USB_DRV=m
@@ -5208,22 +5690,22 @@ CONFIG_VIDEO_EM28XX_RC=m
 #
 CONFIG_USB_AIRSPY=m
 CONFIG_USB_HACKRF=m
-# CONFIG_USB_MSI2500 is not set
+CONFIG_USB_MSI2500=m
 
 #
 # USB HDMI CEC adapters
 #
 CONFIG_USB_PULSE8_CEC=m
-# CONFIG_USB_RAINSHADOW_CEC is not set
+CONFIG_USB_RAINSHADOW_CEC=m
 CONFIG_MEDIA_PCI_SUPPORT=y
 
 #
 # Media capture support
 #
 CONFIG_VIDEO_SOLO6X10=m
-# CONFIG_VIDEO_TW5864 is not set
+CONFIG_VIDEO_TW5864=m
 CONFIG_VIDEO_TW68=m
-# CONFIG_VIDEO_TW686X is not set
+CONFIG_VIDEO_TW686X=m
 
 #
 # Media capture/analog TV support
@@ -5286,28 +5768,39 @@ CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
 # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
 CONFIG_DVB_SMIPCIE=m
-# CONFIG_DVB_NETUP_UNIDVB is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_ASPEED=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_CODA=m
 CONFIG_VIDEO_IMX_PXP=m
 CONFIG_VIDEO_MEDIATEK_VPU=m
 CONFIG_VIDEO_MEDIATEK_MDP=m
-# CONFIG_VIDEO_MEDIATEK_VCODEC is not set
-# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set
-# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
-# CONFIG_VIDEO_SH_VEU is not set
-# CONFIG_VIDEO_RENESAS_JPU is not set
-# CONFIG_VIDEO_RENESAS_FCP is not set
+CONFIG_VIDEO_MEDIATEK_VCODEC=m
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
+CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+CONFIG_VIDEO_SH_VEU=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
-# CONFIG_VIDEO_QCOM_VENUS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-# CONFIG_CEC_PLATFORM_DRIVERS is not set
-# CONFIG_SDR_PLATFORM_DRIVERS is not set
+CONFIG_VIDEO_QCOM_VENUS=m
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VIM2M=m
+CONFIG_VIDEO_VICODEC=m
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_CEC_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CROS_EC_CEC=m
+CONFIG_VIDEO_MESON_AO_CEC=m
+CONFIG_VIDEO_MESON_G12A_AO_CEC=m
+CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
+CONFIG_VIDEO_TEGRA_HDMI_CEC=m
+CONFIG_SDR_PLATFORM_DRIVERS=y
 
 #
 # Supported MMC/SDIO adapters
@@ -5317,7 +5810,7 @@ CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_TEA575X=m
 CONFIG_RADIO_SI470X=m
 CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
+# CONFIG_I2C_SI470X is not set
 CONFIG_RADIO_SI4713=m
 CONFIG_USB_SI4713=m
 CONFIG_PLATFORM_SI4713=m
@@ -5338,8 +5831,14 @@ CONFIG_RADIO_WL1273=m
 #
 # Texas Instruments WL128x FM driver (ST based)
 #
+CONFIG_RADIO_WL128X=m
 # end of Texas Instruments WL128x FM driver (ST based)
 
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
 CONFIG_MEDIA_COMMON_OPTIONS=y
 
 #
@@ -5361,6 +5860,7 @@ CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
 # CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_VIDEO_V4L2_TPG=m
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
@@ -5379,14 +5879,13 @@ CONFIG_VIDEO_IR_I2C=m
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
-# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
-# CONFIG_VIDEO_TLV320AIC23B is not set
+CONFIG_VIDEO_TLV320AIC23B=m
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -5401,27 +5900,22 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV748X is not set
-# CONFIG_VIDEO_ADV7604 is not set
-# CONFIG_VIDEO_ADV7842 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
-# CONFIG_VIDEO_TC358743 is not set
-# CONFIG_VIDEO_TVP514X is not set
+CONFIG_VIDEO_TVP514X=m
 CONFIG_VIDEO_TVP5150=m
-# CONFIG_VIDEO_TVP7002 is not set
+CONFIG_VIDEO_TVP7002=m
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
 
 #
 # Video and audio decoders
@@ -5433,79 +5927,47 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_AD9389B is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_THS8200 is not set
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_THS8200=m
 
 #
 # Camera sensor devices
 #
-# CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-CONFIG_VIDEO_OV5675=m
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV772X=m
 CONFIG_VIDEO_OV7640=m
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_RJ54N1=m
 
 #
 # Lens drivers
 #
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
+CONFIG_VIDEO_AD5820=m
 
 #
 # Flash devices
 #
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
 
 #
 # Video improvement chips
@@ -5521,27 +5983,25 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # SDR tuner chips
 #
-# CONFIG_SDR_MAX2175 is not set
+CONFIG_SDR_MAX2175=m
 
 #
 # Miscellaneous helper chips
 #
-# CONFIG_VIDEO_THS7303 is not set
+CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
+CONFIG_VIDEO_I2C=m
 # end of I2C Encoders, decoders, sensors and other helper chips
 
 #
 # SPI helper chips
 #
-# CONFIG_VIDEO_GS1662 is not set
 # end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
-# CONFIG_CXD2880_SPI_DRV is not set
+CONFIG_CXD2880_SPI_DRV=m
 # end of Media SPI Adapters
 
 CONFIG_MEDIA_TUNER=m
@@ -5557,7 +6017,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
-# CONFIG_MEDIA_TUNER_MSI001 is not set
+CONFIG_MEDIA_TUNER_MSI001=m
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5651,7 +6111,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
+CONFIG_DVB_S5H1432=m
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5662,7 +6122,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
-# CONFIG_DVB_DIB9000 is not set
+CONFIG_DVB_DIB9000=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5674,9 +6134,9 @@ CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
-# CONFIG_DVB_ZD1301_DEMOD is not set
+CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
-# CONFIG_DVB_CXD2880 is not set
+CONFIG_DVB_CXD2880=m
 
 #
 # DVB-C (cable) frontends
@@ -5714,7 +6174,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
-# CONFIG_DVB_MN88443X is not set
+CONFIG_DVB_MN88443X=m
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5728,23 +6188,23 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
-# CONFIG_DVB_LNBH29 is not set
+CONFIG_DVB_LNBH29=m
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
-# CONFIG_DVB_LGS8GL5 is not set
+CONFIG_DVB_LGS8GL5=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
 CONFIG_DVB_IX2505V=m
 CONFIG_DVB_M88RS2000=m
 CONFIG_DVB_AF9033=m
-# CONFIG_DVB_HORUS3A is not set
-# CONFIG_DVB_ASCOT2E is not set
-# CONFIG_DVB_HELENE is not set
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
 
 #
 # Common Interface (EN50221) controller drivers
@@ -5768,7 +6228,7 @@ CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
+CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
@@ -5782,7 +6242,6 @@ CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
 #
@@ -5791,7 +6250,7 @@ CONFIG_DRM_SCHED=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+CONFIG_DRM_I2C_NXP_TDA9950=m
 # end of I2C encoder or helper chips
 
 #
@@ -5806,15 +6265,15 @@ CONFIG_DRM_KOMEDA=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
-# CONFIG_DRM_AMDGPU_CIK is not set
-# CONFIG_DRM_AMDGPU_USERPTR is not set
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
-# CONFIG_DRM_AMD_ACP is not set
+CONFIG_DRM_AMD_ACP=y
 # end of ACP (Audio CoProcessor) Configuration
 
 #
@@ -5824,27 +6283,41 @@ CONFIG_DRM_AMD_DC=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 # end of Display Engine Configuration
 
-# CONFIG_HSA_AMD is not set
+CONFIG_HSA_AMD=y
 CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_VGEM=m
-# CONFIG_DRM_VKMS is not set
-CONFIG_DRM_ATI_PCIGART=y
+# CONFIG_DRM_VGEM is not set
+CONFIG_DRM_VKMS=m
 # CONFIG_DRM_EXYNOS is not set
+CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_CDN_DP=y
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_INNO_HDMI=y
+CONFIG_ROCKCHIP_LVDS=y
+CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_RK3066_HDMI=y
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_CIRRUS_QEMU=m
-# CONFIG_DRM_RCAR_DU is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
+CONFIG_DRM_RCAR_DW_HDMI=m
+CONFIG_DRM_RCAR_LVDS=m
 CONFIG_DRM_RCAR_WRITEBACK=y
-# CONFIG_DRM_SUN4I is not set
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
+CONFIG_DRM_SUN4I_HDMI_CEC=y
+CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN6I_DSI=m
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_VIRTIO_GPU=m
@@ -5862,46 +6335,46 @@ CONFIG_DRM_MSM_DSI_14NM_PHY=y
 CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
-CONFIG_DRM_TEGRA_STAGING=y
+# CONFIG_DRM_TEGRA_STAGING is not set
 CONFIG_DRM_PANEL=y
 
 #
 # Display Panels
 #
-# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
-# CONFIG_DRM_PANEL_LVDS is not set
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
-# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
-# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+CONFIG_DRM_PANEL_ILITEK_IL9322=m
+CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
+CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
+CONFIG_DRM_PANEL_JDI_LT070ME05000=m
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 CONFIG_DRM_PANEL_LG_LB035Q02=m
-# CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LG_LG4573=m
 CONFIG_DRM_PANEL_NEC_NL8048HL11=m
 CONFIG_DRM_PANEL_NOVATEK_NT39016=m
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
-# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
-# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
+CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
-# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
 CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
 CONFIG_DRM_PANEL_RONBO_RB070D30=m
 CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
-# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E63M0=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
-# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
-# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SITRONIX_ST7701=m
-# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 CONFIG_DRM_PANEL_SONY_ACX565AKM=m
 CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
 CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
@@ -5916,28 +6389,30 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
-# CONFIG_DRM_CDNS_DSI is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_CDNS_DSI=m
+CONFIG_DRM_DUMB_VGA_DAC=m
+CONFIG_DRM_LVDS_ENCODER=m
+CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW=m
 CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_SIL_SII8620=m
-# CONFIG_DRM_SII902X is not set
+CONFIG_DRM_SII902X=m
 CONFIG_DRM_SII9234=m
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
+CONFIG_DRM_THINE_THC63LVD1024=m
 CONFIG_DRM_TOSHIBA_TC358764=m
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
+CONFIG_DRM_TOSHIBA_TC358767=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TI_SN65DSI86=m
+CONFIG_DRM_ANALOGIX_DP=m
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_DW_HDMI=m
-# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
-# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_DW_MIPI_DSI=m
 # end of Display Interface Bridges
 
 CONFIG_DRM_VC4=m
@@ -5949,9 +6424,8 @@ CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_HISI_KIRIN=m
 CONFIG_DRM_MEDIATEK=m
 CONFIG_DRM_MEDIATEK_HDMI=m
-# CONFIG_DRM_ZTE is not set
-CONFIG_DRM_MXS=y
-CONFIG_DRM_MXSFB=m
+CONFIG_DRM_ZTE=m
+# CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_GM12U320=m
@@ -5962,16 +6436,11 @@ CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
-# CONFIG_DRM_PL111 is not set
+CONFIG_DRM_PL111=m
 CONFIG_DRM_LIMA=m
 CONFIG_DRM_PANFROST=m
-CONFIG_DRM_LEGACY=y
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
+# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
 # Frame buffer Devices
@@ -5980,6 +6449,7 @@ CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -5998,18 +6468,18 @@ CONFIG_FB_TILEBLITTING=y
 #
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
-CONFIG_FB_ARMCLCD=y
+# CONFIG_FB_ARMCLCD is not set
 CONFIG_FB_IMX=m
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_UVESA is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_UVESA=m
+CONFIG_FB_EFI=y
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
+CONFIG_FB_I740=m
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set
@@ -6026,18 +6496,18 @@ CONFIG_FB_IMX=m
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
 # CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SH_MOBILE_LCDC is not set
-# CONFIG_FB_SM501 is not set
-# CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_UDL=m
+CONFIG_FB_SMSCUFX=m
+# CONFIG_FB_UDL is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 CONFIG_FB_XILINX=m
 CONFIG_FB_VIRTUAL=m
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_MX3=y
-CONFIG_FB_SIMPLE=y
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
 # end of Frame buffer Devices
 
@@ -6056,22 +6526,25 @@ CONFIG_LCD_PLATFORM=m
 # CONFIG_LCD_AMS369FG06 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_HX8357 is not set
-# CONFIG_LCD_OTM3225A is not set
+CONFIG_LCD_OTM3225A=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_LM3533=m
 CONFIG_BACKLIGHT_PWM=m
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
+CONFIG_BACKLIGHT_PM8941_WLED=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
 CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_SKY81452=m
 CONFIG_BACKLIGHT_GPIO=m
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
 # end of Backlight & LCD device support
 
+CONFIG_VGASTATE=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
 
@@ -6084,18 +6557,15 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 # end of Console display driver support
 
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 # end of Graphics support
 
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
@@ -6116,11 +6586,13 @@ CONFIG_SND_PCM_TIMER=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VERBOSE_PRINTK=y
+CONFIG_SND_DEBUG=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
+CONFIG_SND_PCM_XRUN_DEBUG=y
 CONFIG_SND_VMASTER=y
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
@@ -6140,8 +6612,10 @@ CONFIG_SND_DUMMY=m
 CONFIG_SND_ALOOP=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_PCI=y
@@ -6151,7 +6625,7 @@ CONFIG_SND_ATIIXP_MODEM=m
 CONFIG_SND_AU8810=m
 CONFIG_SND_AU8820=m
 CONFIG_SND_AU8830=m
-# CONFIG_SND_AW2 is not set
+CONFIG_SND_AW2=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
 CONFIG_SND_CA0106=m
@@ -6207,11 +6681,11 @@ CONFIG_SND_YMFPCI=m
 CONFIG_SND_HDA=m
 CONFIG_SND_HDA_INTEL=m
 # CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-# CONFIG_SND_HDA_TEGRA is not set
+CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_CODEC_REALTEK=m
 CONFIG_SND_HDA_CODEC_ANALOG=m
@@ -6226,13 +6700,14 @@ CONFIG_SND_HDA_CODEC_CA0132_DSP=y
 CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
 # end of HD-Audio
 
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_ALIGNED_MMIO=y
 CONFIG_SND_HDA_COMPONENT=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_HDA_PREALLOC_SIZE=1024
 CONFIG_SND_INTEL_NHLT=m
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
@@ -6243,23 +6718,39 @@ CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_USB_LINE6=m
 CONFIG_SND_USB_POD=m
 CONFIG_SND_USB_PODHD=m
 CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_TOPOLOGY=y
 CONFIG_SND_SOC_ACPI=m
 CONFIG_SND_SOC_AMD_ACP=m
-# CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_BCM2835_SOC_I2S=m
-# CONFIG_SND_DESIGNWARE_I2S is not set
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_DESIGNWARE_PCM=y
 
 #
 # SoC Audio for Freescale CPUs
@@ -6268,7 +6759,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
 #
 # Common SoC Audio options for Freescale CPUs:
 #
-# CONFIG_SND_SOC_FSL_ASRC is not set
+CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_AUDMIX=m
 CONFIG_SND_SOC_FSL_SSI=m
@@ -6289,17 +6780,15 @@ CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_IMX_AUDMIX=m
 # end of SoC Audio for Freescale CPUs
 
-# CONFIG_SND_I2S_HI6210_I2S is not set
-# CONFIG_SND_KIRKWOOD_SOC is not set
+CONFIG_SND_I2S_HI6210_I2S=m
+CONFIG_SND_KIRKWOOD_SOC=m
+CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
 # CONFIG_SND_SOC_IMG is not set
 CONFIG_SND_SOC_MEDIATEK=m
 # CONFIG_SND_SOC_MT2701 is not set
-# CONFIG_SND_SOC_MT6797 is not set
-CONFIG_SND_SOC_MT8173=m
-CONFIG_SND_SOC_MT8173_MAX98090=m
-CONFIG_SND_SOC_MT8173_RT5650=m
-CONFIG_SND_SOC_MT8173_RT5650_RT5514=m
-CONFIG_SND_SOC_MT8173_RT5650_RT5676=m
+CONFIG_SND_SOC_MT6797=m
+CONFIG_SND_SOC_MT6797_MT6351=m
+# CONFIG_SND_SOC_MT8173 is not set
 CONFIG_SND_SOC_MT8183=m
 CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
 CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
@@ -6308,43 +6797,70 @@ CONFIG_SND_SOC_MTK_BTCVSD=m
 #
 # ASoC support for Amlogic platforms
 #
-# CONFIG_SND_MESON_AXG_FRDDR is not set
-# CONFIG_SND_MESON_AXG_TODDR is not set
-# CONFIG_SND_MESON_AXG_TDMIN is not set
-# CONFIG_SND_MESON_AXG_TDMOUT is not set
-# CONFIG_SND_MESON_AXG_SOUND_CARD is not set
-# CONFIG_SND_MESON_AXG_SPDIFOUT is not set
+CONFIG_SND_MESON_AXG_FIFO=m
+CONFIG_SND_MESON_AXG_FRDDR=m
+CONFIG_SND_MESON_AXG_TODDR=m
+CONFIG_SND_MESON_AXG_TDM_FORMATTER=m
+CONFIG_SND_MESON_AXG_TDM_INTERFACE=m
+CONFIG_SND_MESON_AXG_TDMIN=m
+CONFIG_SND_MESON_AXG_TDMOUT=m
+CONFIG_SND_MESON_AXG_SOUND_CARD=m
+CONFIG_SND_MESON_AXG_SPDIFOUT=m
 CONFIG_SND_MESON_AXG_SPDIFIN=m
 CONFIG_SND_MESON_AXG_PDM=m
-# CONFIG_SND_MESON_G12A_TOHDMITX is not set
+CONFIG_SND_MESON_G12A_TOHDMITX=m
 # end of ASoC support for Amlogic platforms
 
 CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
+CONFIG_SND_SOC_LPASS_IPQ806X=m
 CONFIG_SND_SOC_LPASS_APQ8016=m
-# CONFIG_SND_SOC_STORM is not set
+CONFIG_SND_SOC_STORM=m
 CONFIG_SND_SOC_APQ8016_SBC=m
-# CONFIG_SND_SOC_ROCKCHIP is not set
-# CONFIG_SND_SOC_SAMSUNG is not set
-
-#
-# SoC Audio support for Renesas SoCs
-#
-# CONFIG_SND_SOC_SH4_FSI is not set
-# CONFIG_SND_SOC_RCAR is not set
-# end of SoC Audio support for Renesas SoCs
-
+CONFIG_SND_SOC_QCOM_COMMON=m
+CONFIG_SND_SOC_QDSP6_COMMON=m
+CONFIG_SND_SOC_QDSP6_CORE=m
+CONFIG_SND_SOC_QDSP6_AFE=m
+CONFIG_SND_SOC_QDSP6_AFE_DAI=m
+CONFIG_SND_SOC_QDSP6_ADM=m
+CONFIG_SND_SOC_QDSP6_ROUTING=m
+CONFIG_SND_SOC_QDSP6_ASM=m
+CONFIG_SND_SOC_QDSP6_ASM_DAI=m
+CONFIG_SND_SOC_QDSP6=m
+CONFIG_SND_SOC_MSM8996=m
+CONFIG_SND_SOC_SDM845=m
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=m
+CONFIG_SND_SOC_ROCKCHIP_PDM=m
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
+CONFIG_SND_SOC_ROCKCHIP_RT5645=m
+CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
+CONFIG_SND_SOC_RK3399_GRU_SOUND=m
+CONFIG_SND_SOC_SAMSUNG=m
+CONFIG_SND_SAMSUNG_PCM=m
+CONFIG_SND_SAMSUNG_SPDIF=m
+CONFIG_SND_SAMSUNG_I2S=m
+CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
+CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
+CONFIG_SND_SOC_SMDK_WM8994_PCM=m
+CONFIG_SND_SOC_SNOW=m
+# CONFIG_SND_SOC_ODROID is not set
+CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI=m
 CONFIG_SND_SOC_SOF_ACPI=m
 CONFIG_SND_SOC_SOF_OF=m
 CONFIG_SND_SOC_SOF_OPTIONS=m
-# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+CONFIG_SND_SOC_SOF_NOCODEC=m
+CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT=y
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 CONFIG_SND_SOC_SOF=m
-# CONFIG_SND_SOC_SOF_IMX_TOPLEVEL is not set
+CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y
+CONFIG_SND_SOC_SOF_IMX8=m
 CONFIG_SND_SOC_SPRD=m
 # CONFIG_SND_SOC_SPRD_MCDT is not set
 
@@ -6356,173 +6872,193 @@ CONFIG_SND_SOC_SPRD=m
 #
 # Allwinner SoC Audio support
 #
-# CONFIG_SND_SUN4I_CODEC is not set
+CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SUN8I_CODEC=m
-# CONFIG_SND_SUN8I_CODEC_ANALOG is not set
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
 CONFIG_SND_SUN50I_CODEC_ANALOG=m
-# CONFIG_SND_SUN4I_I2S is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
+CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
 # end of Allwinner SoC Audio support
 
-# CONFIG_SND_SOC_TEGRA is not set
-# CONFIG_SND_SOC_UNIPHIER is not set
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
-# CONFIG_SND_SOC_XTFPGA_I2S is not set
+CONFIG_SND_SOC_XTFPGA_I2S=m
 # CONFIG_ZX_SPDIF is not set
 # CONFIG_ZX_I2S is not set
-# CONFIG_ZX_TDM is not set
+CONFIG_ZX_TDM=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
 # CODEC drivers
 #
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_ADAU1701 is not set
-# CONFIG_SND_SOC_ADAU1761_I2C is not set
-# CONFIG_SND_SOC_ADAU1761_SPI is not set
-# CONFIG_SND_SOC_ADAU7002 is not set
-# CONFIG_SND_SOC_AK4104 is not set
+CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_AK4104=m
 CONFIG_SND_SOC_AK4118=m
-# CONFIG_SND_SOC_AK4458 is not set
-# CONFIG_SND_SOC_AK4554 is not set
-# CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4642 is not set
-# CONFIG_SND_SOC_AK5386 is not set
-# CONFIG_SND_SOC_AK5558 is not set
-# CONFIG_SND_SOC_ALC5623 is not set
-# CONFIG_SND_SOC_BD28623 is not set
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_BD28623=m
 CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CPCAP=m
 CONFIG_SND_SOC_CROS_EC_CODEC=m
-# CONFIG_SND_SOC_CS35L32 is not set
-# CONFIG_SND_SOC_CS35L33 is not set
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
 CONFIG_SND_SOC_CS35L34=m
-# CONFIG_SND_SOC_CS35L35 is not set
+CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
 CONFIG_SND_SOC_CS42L42=m
-# CONFIG_SND_SOC_CS42L51_I2C is not set
-# CONFIG_SND_SOC_CS42L52 is not set
-# CONFIG_SND_SOC_CS42L56 is not set
-# CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_CS4270 is not set
-# CONFIG_SND_SOC_CS4271_I2C is not set
-# CONFIG_SND_SOC_CS4271_SPI is not set
-# CONFIG_SND_SOC_CS42XX8_I2C is not set
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
-# CONFIG_SND_SOC_CS4349 is not set
-# CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
-# CONFIG_SND_SOC_ES7134 is not set
-# CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8316 is not set
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
-# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_GTM601=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_LOCHNAGAR_SC=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_MAX98357A=m
-# CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX9867 is not set
-# CONFIG_SND_SOC_MAX98927 is not set
-# CONFIG_SND_SOC_MAX98373 is not set
-# CONFIG_SND_SOC_MAX9860 is not set
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
-# CONFIG_SND_SOC_PCM1681 is not set
-# CONFIG_SND_SOC_PCM1789_I2C is not set
-# CONFIG_SND_SOC_PCM179X_I2C is not set
-# CONFIG_SND_SOC_PCM179X_SPI is not set
-# CONFIG_SND_SOC_PCM186X_I2C is not set
-# CONFIG_SND_SOC_PCM186X_SPI is not set
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX9860=m
+# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
 CONFIG_SND_SOC_PCM3060=m
 CONFIG_SND_SOC_PCM3060_I2C=m
 CONFIG_SND_SOC_PCM3060_SPI=m
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
 CONFIG_SND_SOC_RK3328=m
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RT5514=m
-# CONFIG_SND_SOC_RT5616 is not set
-# CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
 CONFIG_SND_SOC_RT5645=m
-CONFIG_SND_SOC_RT5677=m
-CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5663=m
 CONFIG_SND_SOC_SGTL5000=m
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
-# CONFIG_SND_SOC_SPDIF is not set
-# CONFIG_SND_SOC_SSM2305 is not set
-# CONFIG_SND_SOC_SSM2602_SPI is not set
-# CONFIG_SND_SOC_SSM2602_I2C is not set
-# CONFIG_SND_SOC_SSM4567 is not set
-# CONFIG_SND_SOC_STA32X is not set
-# CONFIG_SND_SOC_STA350 is not set
-# CONFIG_SND_SOC_STI_SAS is not set
-# CONFIG_SND_SOC_TAS2552 is not set
-# CONFIG_SND_SOC_TAS5086 is not set
-# CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_SND_SOC_TAS5720 is not set
-# CONFIG_SND_SOC_TAS6424 is not set
-# CONFIG_SND_SOC_TDA7419 is not set
-# CONFIG_SND_SOC_TFA9879 is not set
-# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC3X is not set
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TS3A227E=m
-# CONFIG_SND_SOC_TSCS42XX is not set
-# CONFIG_SND_SOC_TSCS454 is not set
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
 CONFIG_SND_SOC_UDA1334=m
-# CONFIG_SND_SOC_WM8510 is not set
-# CONFIG_SND_SOC_WM8523 is not set
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8524=m
-# CONFIG_SND_SOC_WM8580 is not set
-# CONFIG_SND_SOC_WM8711 is not set
-# CONFIG_SND_SOC_WM8728 is not set
-# CONFIG_SND_SOC_WM8731 is not set
-# CONFIG_SND_SOC_WM8737 is not set
-# CONFIG_SND_SOC_WM8741 is not set
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8770 is not set
-# CONFIG_SND_SOC_WM8776 is not set
-# CONFIG_SND_SOC_WM8782 is not set
-# CONFIG_SND_SOC_WM8804_I2C is not set
-# CONFIG_SND_SOC_WM8804_SPI is not set
-# CONFIG_SND_SOC_WM8903 is not set
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8904=m
-# CONFIG_SND_SOC_WM8960 is not set
-# CONFIG_SND_SOC_WM8962 is not set
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM8978 is not set
-# CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
-# CONFIG_SND_SOC_MAX9759 is not set
-# CONFIG_SND_SOC_MT6351 is not set
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WM8994=m
+CONFIG_SND_SOC_ZX_AUD96P22=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
 CONFIG_SND_SOC_MT6358=m
-# CONFIG_SND_SOC_NAU8540 is not set
-# CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
-# CONFIG_SND_SOC_NAU8824 is not set
-# CONFIG_SND_SOC_TPA6130A2 is not set
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_TPA6130A2=m
 # end of CODEC drivers
 
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_CARD is not set
+CONFIG_SND_AUDIO_GRAPH_CARD=m
 CONFIG_AC97_BUS=m
 
 #
@@ -6532,18 +7068,18 @@ CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
-CONFIG_HID_GENERIC=y
+CONFIG_HID_GENERIC=m
 
 #
 # Special HID drivers
 #
 CONFIG_HID_A4TECH=m
-# CONFIG_HID_ACCUTOUCH is not set
+CONFIG_HID_ACCUTOUCH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_APPLEIR=m
-# CONFIG_HID_ASUS is not set
+CONFIG_HID_ASUS=m
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
@@ -6554,14 +7090,14 @@ CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
 CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
+# CONFIG_HID_CMEDIA is not set
 CONFIG_HID_CP2112=m
 CONFIG_HID_CREATIVE_SB0540=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
-# CONFIG_HID_ELAN is not set
+CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
@@ -6569,7 +7105,7 @@ CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GFRM=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
-# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_HAMMER=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -6578,8 +7114,8 @@ CONFIG_HID_WALTOP=m
 CONFIG_HID_VIEWSONIC=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_ICADE=m
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
@@ -6595,11 +7131,11 @@ CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MALTRON=m
 CONFIG_HID_MAYFLASH=m
-# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_REDRAGON=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NTI is not set
+CONFIG_HID_NTI=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
@@ -6614,7 +7150,7 @@ CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PRIMAX=m
-# CONFIG_HID_RETRODE is not set
+CONFIG_HID_RETRODE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
@@ -6644,15 +7180,22 @@ CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-# CONFIG_HID_ALPS is not set
+CONFIG_HID_ALPS=m
 # end of Special HID drivers
 
 #
 # USB HID support
 #
-CONFIG_USB_HID=y
+CONFIG_USB_HID=m
 CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
 # end of USB HID support
 
 #
@@ -6666,10 +7209,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_LED_TRIG=y
-CONFIG_USB_ULPI_BUS=y
+CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_CONN_GPIO=m
 CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=y
+CONFIG_USB=m
 CONFIG_USB_PCI=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
@@ -6678,52 +7221,54 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 #
 CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
+CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+CONFIG_USB_OTG_FSM=m
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=y
+CONFIG_USB_MON=m
 
 #
 # USB Host Controller Drivers
 #
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=y
-CONFIG_USB_XHCI_PLATFORM=y
-# CONFIG_USB_XHCI_HISTB is not set
-CONFIG_USB_XHCI_MTK=y
-CONFIG_USB_XHCI_MVEBU=y
-CONFIG_USB_XHCI_RCAR=y
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_XHCI_HISTB=m
+CONFIG_USB_XHCI_MTK=m
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_USB_XHCI_TEGRA=m
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_EHCI_PCI=m
 CONFIG_USB_EHCI_FSL=m
 CONFIG_USB_EHCI_MXC=m
-CONFIG_USB_EHCI_HCD_ORION=y
-CONFIG_USB_EHCI_TEGRA=y
-# CONFIG_USB_EHCI_EXYNOS is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-CONFIG_USB_MAX3421_HCD=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_PCI=y
-# CONFIG_USB_OHCI_EXYNOS is not set
-CONFIG_USB_OHCI_HCD_PLATFORM=y
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_USB_EHCI_TEGRA=m
+CONFIG_USB_EHCI_EXYNOS=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_HCD_ISO=y
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_BCMA is not set
-# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
 # CONFIG_USB_HCD_TEST_MODE is not set
-# CONFIG_USB_RENESAS_USBHS is not set
 
 #
 # USB Device Class drivers
@@ -6740,23 +7285,23 @@ CONFIG_USB_TMC=m
 #
 # also be needed; see USB_STORAGE Help for more info
 #
-CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=y
+CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
-CONFIG_USB_STORAGE_ENE_UB6250=y
-CONFIG_USB_UAS=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
 
 #
 # USB Imaging devices
@@ -6775,11 +7320,11 @@ CONFIG_USB_CDNS3_GADGET=y
 CONFIG_USB_CDNS3_HOST=y
 CONFIG_USB_CDNS3_PCI_WRAP=m
 CONFIG_USB_MTU3=m
-# CONFIG_USB_MTU3_HOST is not set
+CONFIG_USB_MTU3_HOST=y
 # CONFIG_USB_MTU3_GADGET is not set
-CONFIG_USB_MTU3_DUAL_ROLE=y
+# CONFIG_USB_MTU3_DUAL_ROLE is not set
 # CONFIG_USB_MTU3_DEBUG is not set
-CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_HOST=y
 # CONFIG_USB_MUSB_GADGET is not set
 # CONFIG_USB_MUSB_DUAL_ROLE is not set
@@ -6787,43 +7332,40 @@ CONFIG_USB_MUSB_HOST=y
 #
 # Platform Glue Layer
 #
+CONFIG_USB_MUSB_SUNXI=m
 
 #
 # MUSB DMA mode
 #
-# CONFIG_MUSB_PIO_ONLY is not set
-CONFIG_USB_DWC3=y
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_ULPI=y
-CONFIG_USB_DWC3_HOST=y
+# CONFIG_USB_DWC3_HOST is not set
 # CONFIG_USB_DWC3_GADGET is not set
-# CONFIG_USB_DWC3_DUAL_ROLE is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
 
 #
 # Platform Glue Driver Support
 #
-CONFIG_USB_DWC3_EXYNOS=y
-CONFIG_USB_DWC3_PCI=y
-CONFIG_USB_DWC3_HAPS=y
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
 CONFIG_USB_DWC3_MESON_G12A=m
-CONFIG_USB_DWC3_OF_SIMPLE=y
-CONFIG_USB_DWC3_QCOM=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_DWC2_HOST=y
+CONFIG_USB_DWC3_OF_SIMPLE=m
+CONFIG_USB_DWC3_QCOM=m
+CONFIG_USB_DWC2=m
+# CONFIG_USB_DWC2_HOST is not set
 
 #
 # Gadget/Dual-role mode requires USB Gadget support to be enabled
 #
 # CONFIG_USB_DWC2_PERIPHERAL is not set
-# CONFIG_USB_DWC2_DUAL_ROLE is not set
-CONFIG_USB_DWC2_PCI=y
+CONFIG_USB_DWC2_DUAL_ROLE=y
+CONFIG_USB_DWC2_PCI=m
 # CONFIG_USB_DWC2_DEBUG is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_OF=y
-CONFIG_USB_CHIPIDEA_PCI=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_ISP1760=y
+# CONFIG_USB_CHIPIDEA is not set
+CONFIG_USB_ISP1760=m
 CONFIG_USB_ISP1760_HCD=y
 CONFIG_USB_ISP1760_HOST_ROLE=y
 # CONFIG_USB_ISP1760_GADGET_ROLE is not set
@@ -6832,8 +7374,8 @@ CONFIG_USB_ISP1760_HOST_ROLE=y
 #
 # USB port drivers
 #
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_CONSOLE=y
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_SIMPLE=m
 CONFIG_USB_SERIAL_AIRCABLE=m
@@ -6863,6 +7405,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_METRO=m
 CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 CONFIG_USB_SERIAL_MOS7840=m
 CONFIG_USB_SERIAL_MXUPORT=m
 CONFIG_USB_SERIAL_NAVMAN=m
@@ -6886,7 +7429,7 @@ CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
-# CONFIG_USB_SERIAL_UPD78F0730 is not set
+CONFIG_USB_SERIAL_UPD78F0730=m
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -6898,8 +7441,8 @@ CONFIG_USB_ADUTUX=m
 CONFIG_USB_SEVSEG=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
@@ -6909,17 +7452,17 @@ CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
 # CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+CONFIG_USB_EHSET_TEST_FIXTURE=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
-# CONFIG_USB_HUB_USB251XB is not set
-CONFIG_USB_HSIC_USB3503=y
-CONFIG_USB_HSIC_USB4604=y
-# CONFIG_USB_LINK_LAYER_TEST is not set
-CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_LINK_LAYER_TEST=m
+# CONFIG_USB_CHAOSKEY is not set
 CONFIG_USB_ATM=m
-# CONFIG_USB_SPEEDTOUCH is not set
+CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
@@ -6928,22 +7471,22 @@ CONFIG_USB_XUSBATM=m
 # USB Physical Layer drivers
 #
 CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=y
+CONFIG_NOP_USB_XCEIV=m
 # CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ISP1301 is not set
+CONFIG_USB_ISP1301=m
 CONFIG_USB_MXS_PHY=m
-CONFIG_USB_TEGRA_PHY=y
+CONFIG_USB_TEGRA_PHY=m
 CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 # end of USB Physical Layer drivers
 
-CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=500
+CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-# CONFIG_U_SERIAL_CONSOLE is not set
+CONFIG_U_SERIAL_CONSOLE=y
 
 #
 # USB Peripheral Controller
@@ -6952,69 +7495,113 @@ CONFIG_USB_FSL_USB2=m
 # CONFIG_USB_FOTG210_UDC is not set
 # CONFIG_USB_GR_UDC is not set
 # CONFIG_USB_R8A66597 is not set
-# CONFIG_USB_RENESAS_USB3 is not set
 # CONFIG_USB_PXA27X is not set
 # CONFIG_USB_MV_UDC is not set
 # CONFIG_USB_MV_U3D is not set
-# CONFIG_USB_SNP_UDC_PLAT is not set
+CONFIG_USB_SNP_CORE=m
+CONFIG_USB_SNP_UDC_PLAT=m
 # CONFIG_USB_M66592 is not set
-# CONFIG_USB_BDC_UDC is not set
+CONFIG_USB_BDC_UDC=m
+
+#
+# Platform Support
+#
+CONFIG_USB_BDC_PCI=m
 # CONFIG_USB_AMD5536UDC is not set
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_NET2280 is not set
 # CONFIG_USB_GOKU is not set
 # CONFIG_USB_EG20T is not set
-# CONFIG_USB_GADGET_XILINX is not set
+CONFIG_USB_GADGET_XILINX=m
 # CONFIG_USB_DUMMY_HCD is not set
 # end of USB Peripheral Controller
 
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
 CONFIG_USB_U_SERIAL=m
 CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
 CONFIG_USB_F_SERIAL=m
 CONFIG_USB_F_OBEX=m
 CONFIG_USB_F_NCM=m
 CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
 CONFIG_USB_F_EEM=m
 CONFIG_USB_F_SUBSET=m
 CONFIG_USB_F_RNDIS=m
 CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
 CONFIG_USB_F_HID=m
-# CONFIG_USB_CONFIGFS is not set
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_CONFIGFS_F_TCM=y
 # CONFIG_USB_ZERO is not set
-# CONFIG_USB_AUDIO is not set
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 CONFIG_USB_ETH_EEM=y
 CONFIG_USB_G_NCM=m
 CONFIG_USB_GADGETFS=m
-# CONFIG_USB_FUNCTIONFS is not set
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
 CONFIG_USB_MASS_STORAGE=m
-# CONFIG_USB_GADGET_TARGET is not set
+CONFIG_USB_GADGET_TARGET=m
 CONFIG_USB_G_SERIAL=m
-# CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
 CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_NOKIA=m
 CONFIG_USB_G_ACM_MS=m
 CONFIG_USB_G_MULTI=m
 CONFIG_USB_G_MULTI_RNDIS=y
 CONFIG_USB_G_MULTI_CDC=y
 CONFIG_USB_G_HID=m
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_WEBCAM is not set
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
 CONFIG_TYPEC=m
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
-# CONFIG_TYPEC_RT1711H is not set
+CONFIG_TYPEC_RT1711H=m
 CONFIG_TYPEC_FUSB302=m
-# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
 CONFIG_TYPEC_TPS6598X=m
 
 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
-# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+CONFIG_TYPEC_MUX_PI3USB30532=m
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
@@ -7024,13 +7611,13 @@ CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_NVIDIA_ALTMODE=m
 # end of USB Type-C Alternate Mode drivers
 
-CONFIG_USB_ROLE_SWITCH=y
-CONFIG_MMC=y
-CONFIG_PWRSEQ_EMMC=y
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=32
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_MMC=m
+CONFIG_PWRSEQ_EMMC=m
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 
@@ -7038,63 +7625,60 @@ CONFIG_SDIO_UART=m
 # MMC/SD/SDIO Host Controller Drivers
 #
 # CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_ARMMMCI=y
-# CONFIG_MMC_QCOM_DML is not set
+CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_QCOM_DML=y
 CONFIG_MMC_STM32_SDMMC=y
-CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_PCI=y
+CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_OF_ARASAN=y
-CONFIG_MMC_SDHCI_OF_ASPEED=m
-CONFIG_MMC_SDHCI_OF_AT91=y
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
+# CONFIG_MMC_SDHCI_OF_ASPEED is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
+CONFIG_MMC_SDHCI_OF_DWCMSHC=m
 CONFIG_MMC_SDHCI_CADENCE=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
-CONFIG_MMC_SDHCI_TEGRA=y
-CONFIG_MMC_SDHCI_PXAV3=y
-CONFIG_MMC_SDHCI_F_SDH30=y
-CONFIG_MMC_SDHCI_IPROC=y
-CONFIG_MMC_MESON_GX=y
-CONFIG_MMC_MESON_MX_SDIO=y
+CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_SDHCI_IPROC=m
+CONFIG_MMC_MESON_GX=m
+# CONFIG_MMC_MESON_MX_SDIO is not set
 CONFIG_MMC_ALCOR=m
-CONFIG_MMC_SDHCI_MSM=y
-CONFIG_MMC_MXC=m
-CONFIG_MMC_TIFM_SD=y
-CONFIG_MMC_SPI=y
+CONFIG_MMC_SDHCI_MSM=m
+# CONFIG_MMC_MXC is not set
+CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_SDHCI_SPRD=m
-CONFIG_MMC_TMIO_CORE=m
-# CONFIG_MMC_SDHI is not set
-CONFIG_MMC_UNIPHIER=m
-CONFIG_MMC_CB710=y
-CONFIG_MMC_VIA_SDMMC=y
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_CAVIUM_THUNDERX=m
-CONFIG_MMC_DW=y
-CONFIG_MMC_DW_PLTFM=y
-# CONFIG_MMC_DW_BLUEFIELD is not set
-CONFIG_MMC_DW_EXYNOS=y
-# CONFIG_MMC_DW_HI3798CV200 is not set
-CONFIG_MMC_DW_K3=y
-CONFIG_MMC_DW_PCI=y
-CONFIG_MMC_DW_ROCKCHIP=y
-# CONFIG_MMC_DW_ZX is not set
-# CONFIG_MMC_SH_MMCIF is not set
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_PLTFM=m
+CONFIG_MMC_DW_BLUEFIELD=m
+CONFIG_MMC_DW_EXYNOS=m
+CONFIG_MMC_DW_HI3798CV200=m
+CONFIG_MMC_DW_K3=m
+CONFIG_MMC_DW_PCI=m
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_MMC_DW_ZX=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_USHC=m
-# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_USDHI6ROL0=m
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_SUNXI=y
-CONFIG_MMC_CQHCI=y
-CONFIG_MMC_TOSHIBA_PCI=y
+CONFIG_MMC_SUNXI=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_BCM2835=m
-CONFIG_MMC_MTK=y
-CONFIG_MMC_SDHCI_BRCMSTB=y
-CONFIG_MMC_SDHCI_XENON=y
-CONFIG_MMC_SDHCI_OMAP=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_BRCMSTB=m
+CONFIG_MMC_SDHCI_XENON=m
+# CONFIG_MMC_SDHCI_OMAP is not set
 CONFIG_MMC_SDHCI_AM654=m
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
@@ -7104,7 +7688,7 @@ CONFIG_MEMSTICK=m
 #
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
+CONFIG_MS_BLOCK=m
 
 #
 # MemoryStick Host Controller Drivers
@@ -7117,7 +7701,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 
 #
 # LED drivers
@@ -7127,89 +7711,138 @@ CONFIG_LEDS_AN30259A=m
 CONFIG_LEDS_AS3645A=m
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
-# CONFIG_LEDS_CR0014114 is not set
+CONFIG_LEDS_CPCAP=m
+CONFIG_LEDS_CR0014114=m
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3532=m
-# CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_LM3601X is not set
-# CONFIG_LEDS_PCA9532 is not set
-CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_LM3692X=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP3944=m
-# CONFIG_LEDS_LP3952 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+CONFIG_LEDS_LP8860=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA955X_GPIO=y
 CONFIG_LEDS_PCA963X=m
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_PWM=m
 # CONFIG_LEDS_REGULATOR is not set
-# CONFIG_LEDS_BD2802 is not set
+CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_LT3593=m
-# CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_TCA6507=m
 # CONFIG_LEDS_TLC591XX is not set
 CONFIG_LEDS_MAX77650=m
-# CONFIG_LEDS_LM355x is not set
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
 # CONFIG_LEDS_KTD2692 is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-# CONFIG_LEDS_SC27XX_BLTC is not set
+CONFIG_LEDS_IS31FL319X=m
+CONFIG_LEDS_IS31FL32XX=m
+CONFIG_LEDS_SC27XX_BLTC=m
 
 #
 # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 #
 CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_SYSCON is not set
-# CONFIG_LEDS_MLXREG is not set
+CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
-# CONFIG_LEDS_SPI_BYTE is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
+CONFIG_LEDS_SPI_BYTE=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM3697=m
+CONFIG_LEDS_LM36274=m
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_LEDS_TRIGGER_TRANSIENT=y
-CONFIG_LEDS_TRIGGER_CAMERA=y
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
-# CONFIG_LEDS_TRIGGER_NETDEV is not set
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_PATTERN=m
 CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-# CONFIG_INFINIBAND is not set
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_CXGB3=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_I40IW=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
+CONFIG_INFINIBAND_HNS=m
+CONFIG_INFINIBAND_HNS_HIP06=y
+CONFIG_INFINIBAND_HNS_HIP08=y
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-# CONFIG_EDAC_LAYERSCAPE is not set
+CONFIG_EDAC_DEBUG=y
+CONFIG_EDAC_GHES=y
+CONFIG_EDAC_LAYERSCAPE=m
 CONFIG_EDAC_THUNDERX=m
-# CONFIG_EDAC_ALTERA is not set
+CONFIG_EDAC_ALTERA=y
+CONFIG_EDAC_ALTERA_SDRAM=y
+CONFIG_EDAC_ALTERA_OCRAM=y
+CONFIG_EDAC_ALTERA_ETHERNET=y
+CONFIG_EDAC_ALTERA_NAND=y
+CONFIG_EDAC_ALTERA_USB=y
+CONFIG_EDAC_ALTERA_QSPI=y
+CONFIG_EDAC_ALTERA_SDMMC=y
 CONFIG_EDAC_SYNOPSYS=m
 CONFIG_EDAC_XGENE=m
+CONFIG_EDAC_QCOM=m
+CONFIG_EDAC_BLUEFIELD=m
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_SYSTOHC is not set
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 # CONFIG_RTC_DEBUG is not set
 CONFIG_RTC_NVMEM=y
 
@@ -7225,23 +7858,25 @@ CONFIG_RTC_INTF_DEV=y
 #
 # I2C RTC drivers
 #
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
+CONFIG_RTC_DRV_ABB5ZES3=m
 CONFIG_RTC_DRV_ABEOZ9=m
 CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_BRCMSTB=y
+CONFIG_RTC_DRV_AC100=m
+CONFIG_RTC_DRV_BRCMSTB=m
 CONFIG_RTC_DRV_DS1307=m
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1307_CENTURY=y
 CONFIG_RTC_DRV_DS1374=m
 CONFIG_RTC_DRV_DS1374_WDT=y
 CONFIG_RTC_DRV_DS1672=m
 # CONFIG_RTC_DRV_HYM8563 is not set
 CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX77686=m
 CONFIG_RTC_DRV_MESON_VRTC=m
 CONFIG_RTC_DRV_RK808=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-# CONFIG_RTC_DRV_ISL12026 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF85063=m
@@ -7250,16 +7885,16 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-# CONFIG_RTC_DRV_S35390A is not set
+CONFIG_RTC_DRV_BD70528=m
+# CONFIG_RTC_DRV_BQ32K is not set
+CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
-# CONFIG_RTC_DRV_RX8010 is not set
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RX8010=m
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
 CONFIG_RTC_DRV_RV3028=m
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_S5M is not set
+CONFIG_RTC_DRV_RV8803=y
 CONFIG_RTC_DRV_SD3078=m
 
 #
@@ -7272,7 +7907,7 @@ CONFIG_RTC_DRV_SD3078=m
 # CONFIG_RTC_DRV_DS1343 is not set
 # CONFIG_RTC_DRV_DS1347 is not set
 # CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX6916=m
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RX4581 is not set
 # CONFIG_RTC_DRV_RX6110 is not set
@@ -7288,66 +7923,65 @@ CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_DS3232_HWMON=y
 CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
+# CONFIG_RTC_DRV_RV3029C2 is not set
 
 #
 # Platform RTC drivers
 #
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
 CONFIG_RTC_DRV_DS1685_FAMILY=m
 CONFIG_RTC_DRV_DS1685=y
 # CONFIG_RTC_DRV_DS1689 is not set
 # CONFIG_RTC_DRV_DS17285 is not set
 # CONFIG_RTC_DRV_DS17485 is not set
 # CONFIG_RTC_DRV_DS17885 is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
 CONFIG_RTC_DRV_EFI=y
-CONFIG_RTC_DRV_STK17TA8=m
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 CONFIG_RTC_DRV_SC27XX=m
-# CONFIG_RTC_DRV_ZYNQMP is not set
-# CONFIG_RTC_DRV_CROS_EC is not set
+CONFIG_RTC_DRV_ZYNQMP=y
+CONFIG_RTC_DRV_CROS_EC=m
 
 #
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_IMXDI=m
-CONFIG_RTC_DRV_FSL_FTM_ALARM=y
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
 CONFIG_HAVE_S3C_RTC=y
-# CONFIG_RTC_DRV_S3C is not set
-# CONFIG_RTC_DRV_SH is not set
-# CONFIG_RTC_DRV_PL030 is not set
+CONFIG_RTC_DRV_S3C=m
+CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_SUN6I=y
-# CONFIG_RTC_DRV_MV is not set
-# CONFIG_RTC_DRV_ARMADA38X is not set
+CONFIG_RTC_DRV_MV=y
+CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_CADENCE=m
-# CONFIG_RTC_DRV_FTRTC010 is not set
-CONFIG_RTC_DRV_PM8XXX=y
-# CONFIG_RTC_DRV_TEGRA is not set
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_PM8XXX=m
+CONFIG_RTC_DRV_TEGRA=m
 CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_MXC_V2=m
 # CONFIG_RTC_DRV_SNVS is not set
-CONFIG_RTC_DRV_IMX_SC=m
+CONFIG_RTC_DRV_IMX_SC=y
 CONFIG_RTC_DRV_MT7622=m
-CONFIG_RTC_DRV_XGENE=m
+CONFIG_RTC_DRV_XGENE=y
 CONFIG_RTC_DRV_R7301=m
+CONFIG_RTC_DRV_CPCAP=m
 CONFIG_RTC_DRV_RTD119X=y
 
 #
 # HID Sensor RTC drivers
 #
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -7362,43 +7996,41 @@ CONFIG_DMA_OF=y
 CONFIG_ALTERA_MSGDMA=m
 # CONFIG_AMBA_PL08X is not set
 CONFIG_AXI_DMAC=m
-# CONFIG_BCM_SBA_RAID is not set
-CONFIG_DMA_BCM2835=y
-# CONFIG_DMA_SUN6I is not set
-# CONFIG_DW_AXI_DMAC is not set
-# CONFIG_FSL_EDMA is not set
+CONFIG_BCM_SBA_RAID=m
+CONFIG_DMA_BCM2835=m
+CONFIG_DMA_SUN6I=m
+CONFIG_DW_AXI_DMAC=m
+CONFIG_FSL_EDMA=m
 CONFIG_FSL_QDMA=m
 CONFIG_IMX_DMA=m
 CONFIG_IMX_SDMA=m
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_K3_DMA is not set
+CONFIG_K3_DMA=m
 CONFIG_MV_XOR=y
 CONFIG_MV_XOR_V2=y
-# CONFIG_MXS_DMA is not set
+CONFIG_MXS_DMA=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
-# CONFIG_OWL_DMA is not set
-CONFIG_PL330_DMA=m
+CONFIG_OWL_DMA=m
+# CONFIG_PL330_DMA is not set
 CONFIG_SPRD_DMA=m
-CONFIG_TEGRA20_APB_DMA=y
+# CONFIG_TEGRA20_APB_DMA is not set
 CONFIG_TEGRA210_ADMA=y
-CONFIG_UNIPHIER_MDMAC=m
 CONFIG_XGENE_DMA=m
-# CONFIG_XILINX_DMA is not set
-# CONFIG_XILINX_ZYNQMP_DMA is not set
-# CONFIG_ZX_DMA is not set
-# CONFIG_MTK_HSDMA is not set
+CONFIG_XILINX_DMA=m
+CONFIG_XILINX_ZYNQMP_DMA=m
+CONFIG_ZX_DMA=m
+CONFIG_MTK_HSDMA=m
 CONFIG_MTK_CQDMA=m
-CONFIG_QCOM_BAM_DMA=y
-CONFIG_QCOM_HIDMA_MGMT=y
-CONFIG_QCOM_HIDMA=y
+CONFIG_MTK_UART_APDMA=m
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
+# CONFIG_DW_DMAC is not set
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-# CONFIG_RCAR_DMAC is not set
-# CONFIG_RENESAS_USB_DMAC is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 
 #
 # DMA Clients
@@ -7411,28 +8043,34 @@ CONFIG_DMA_ENGINE_RAID=y
 # DMABUF options
 #
 CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
+CONFIG_SW_SYNC=y
 CONFIG_UDMABUF=y
 # CONFIG_DMABUF_SELFTESTS is not set
 # end of DMABUF options
 
 CONFIG_AUXDISPLAY=y
-# CONFIG_HD44780 is not set
+CONFIG_HD44780=m
 # CONFIG_IMG_ASCII_LCD is not set
 CONFIG_HT16K33=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
 # CONFIG_CHARLCD_BL_OFF is not set
 # CONFIG_CHARLCD_BL_ON is not set
 CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_CHARLCD=m
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
-# CONFIG_UIO_NETX is not set
+CONFIG_UIO_NETX=m
 # CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_MF624 is not set
+CONFIG_UIO_MF624=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VFIO=m
@@ -7440,19 +8078,15 @@ CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
-CONFIG_VFIO_PLATFORM=m
-CONFIG_VFIO_AMBA=m
-CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m
-CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
-CONFIG_VFIO_PLATFORM_BCMFLEXRM_RESET=m
+# CONFIG_VFIO_PLATFORM is not set
 CONFIG_VFIO_MDEV=m
 CONFIG_VFIO_MDEV_DEVICE=m
-# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
-# CONFIG_VIRTIO_PMEM is not set
+CONFIG_VIRTIO_PMEM=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
@@ -7466,7 +8100,36 @@ CONFIG_VIRTIO_MMIO=m
 # CONFIG_GREYBUS is not set
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
-# CONFIG_COMEDI is not set
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+# CONFIG_COMEDI_MISC_DRIVERS is not set
+# CONFIG_COMEDI_ISA_DRIVERS is not set
+# CONFIG_COMEDI_PCI_DRIVERS is not set
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
 CONFIG_RTL8192U=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
@@ -7477,9 +8140,9 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-# CONFIG_RTS5208 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
 
 #
 # IIO staging drivers
@@ -7488,76 +8151,89 @@ CONFIG_88EU_AP_MODE=y
 #
 # Accelerometers
 #
-CONFIG_ADIS16203=m
-CONFIG_ADIS16240=m
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
 # end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7816=m
-CONFIG_AD7192=m
-CONFIG_AD7280=m
+# CONFIG_AD7816 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7280 is not set
 # end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
 #
-CONFIG_ADT7316=m
-CONFIG_ADT7316_SPI=m
-CONFIG_ADT7316_I2C=m
+# CONFIG_ADT7316 is not set
 # end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
-CONFIG_AD7150=m
-CONFIG_AD7746=m
+# CONFIG_AD7150 is not set
+# CONFIG_AD7746 is not set
 # end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
-CONFIG_AD9832=m
-CONFIG_AD9834=m
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
 # end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
-CONFIG_AD5933=m
+# CONFIG_AD5933 is not set
 # end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
 #
-CONFIG_ADE7854=m
-CONFIG_ADE7854_I2C=m
-CONFIG_ADE7854_SPI=m
+# CONFIG_ADE7854 is not set
 # end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
-CONFIG_AD2S1210=m
+# CONFIG_AD2S1210 is not set
 # end of Resolver to digital converters
 # end of IIO staging drivers
 
-# CONFIG_FB_SM750 is not set
-# CONFIG_USB_EMXX is not set
+CONFIG_FB_SM750=m
 
 #
 # Speakup console speech
 #
-# CONFIG_SPEAKUP is not set
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
 # end of Speakup console speech
 
-# CONFIG_MFD_NVEC is not set
+CONFIG_MFD_NVEC=m
+CONFIG_KEYBOARD_NVEC=m
+CONFIG_SERIO_NVEC_PS2=m
+CONFIG_NVEC_POWER=m
+CONFIG_NVEC_PAZ00=m
 CONFIG_STAGING_MEDIA=y
-# CONFIG_VIDEO_ALLEGRO_DVT is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
-# CONFIG_VIDEO_SUNXI is not set
-# CONFIG_TEGRA_VDE is not set
+CONFIG_VIDEO_ALLEGRO_DVT=m
+CONFIG_VIDEO_HANTRO=m
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
+CONFIG_VIDEO_MESON_VDEC=m
+CONFIG_VIDEO_SUNXI=y
+CONFIG_VIDEO_SUNXI_CEDRUS=m
+CONFIG_TEGRA_VDE=m
 
 #
 # soc_camera sensor drivers
@@ -7569,10 +8245,13 @@ CONFIG_STAGING_MEDIA=y
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
-# CONFIG_LTE_GDM724X is not set
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
 CONFIG_FB_TFT=m
 CONFIG_FB_TFT_AGM1264K_FL=m
 CONFIG_FB_TFT_BD663474=m
@@ -7605,29 +8284,35 @@ CONFIG_FB_TFT_UC1611=m
 CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
 CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FSL_DPAA2=y
+CONFIG_FSL_DPAA2_ETHSW=m
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
 # CONFIG_MOST is not set
-# CONFIG_KS7010 is not set
+CONFIG_KS7010=m
 CONFIG_BCM_VIDEOCORE=m
 CONFIG_BCM2835_VCHIQ=m
-# CONFIG_SND_BCM2835 is not set
+CONFIG_SND_BCM2835=m
 CONFIG_VIDEO_BCM2835=m
 CONFIG_PI433=m
 
 #
 # Gasket devices
 #
-# CONFIG_STAGING_GASKET_FRAMEWORK is not set
+CONFIG_STAGING_GASKET_FRAMEWORK=m
+CONFIG_STAGING_APEX_DRIVER=m
 # end of Gasket devices
 
 CONFIG_XIL_AXIS_FIFO=m
-# CONFIG_FIELDBUS_DEV is not set
+CONFIG_FIELDBUS_DEV=m
+CONFIG_HMS_ANYBUSS_BUS=m
+CONFIG_ARCX_ANYBUS_CONTROLLER=m
+CONFIG_HMS_PROFINET=m
 # CONFIG_KPC2000 is not set
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
 # CONFIG_USB_WUSB_CBAF_DEBUG is not set
-# CONFIG_USB_WHCI_HCD is not set
+CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
@@ -7643,22 +8328,25 @@ CONFIG_EXFAT_DEFAULT_CODEPAGE=437
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_QLGE=m
 # CONFIG_GOLDFISH is not set
-CONFIG_MFD_CROS_EC=y
+CONFIG_MFD_CROS_EC=m
 CONFIG_CHROME_PLATFORMS=y
-# CONFIG_CHROMEOS_TBMC is not set
-CONFIG_CROS_EC=y
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC=m
 CONFIG_CROS_EC_I2C=m
 CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_EC_PROTO=y
-CONFIG_CROS_KBD_LED_BACKLIGHT=y
-CONFIG_CROS_EC_CHARDEV=y
-CONFIG_CROS_EC_LIGHTBAR=y
-CONFIG_CROS_EC_VBC=y
-CONFIG_CROS_EC_DEBUGFS=y
-CONFIG_CROS_EC_SYSFS=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_VBC=m
+# CONFIG_CROS_EC_DEBUGFS is not set
+CONFIG_CROS_EC_SYSFS=m
 CONFIG_CROS_USBPD_LOGGER=m
-# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_MELLANOX_PLATFORM=y
+CONFIG_MLXREG_HOTPLUG=m
+CONFIG_MLXREG_IO=m
+CONFIG_MLXBF_TMFIFO=m
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -7670,47 +8358,51 @@ CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_VEXPRESS_OSC=y
 # CONFIG_CLK_HSDK is not set
-# CONFIG_COMMON_CLK_MAX9485 is not set
-CONFIG_COMMON_CLK_RK808=y
+CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_HI655X=m
-CONFIG_COMMON_CLK_SCPI=y
-# CONFIG_COMMON_CLK_SI5341 is not set
+CONFIG_COMMON_CLK_SCMI=m
+CONFIG_COMMON_CLK_SCPI=m
+CONFIG_COMMON_CLK_SI5341=m
 # CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
+CONFIG_COMMON_CLK_SI514=m
+CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_S2MPS11 is not set
-# CONFIG_CLK_QORIQ is not set
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CDCE925=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_CLK_QORIQ=y
 CONFIG_COMMON_CLK_XGENE=y
-# CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+CONFIG_COMMON_CLK_LOCHNAGAR=m
+CONFIG_COMMON_CLK_PWM=m
+CONFIG_COMMON_CLK_VC5=m
+CONFIG_COMMON_CLK_BD718XX=m
+CONFIG_COMMON_CLK_FIXED_MMIO=y
 CONFIG_CLK_ACTIONS=y
-CONFIG_CLK_OWL_S500=y
+# CONFIG_CLK_OWL_S500 is not set
 CONFIG_CLK_OWL_S700=y
 CONFIG_CLK_OWL_S900=y
 CONFIG_CLK_BCM2835=y
 CONFIG_COMMON_CLK_IPROC=y
 CONFIG_CLK_BCM_NS2=y
 CONFIG_CLK_BCM_SR=y
-# CONFIG_CLK_RASPBERRYPI is not set
-CONFIG_COMMON_CLK_HI3516CV300=m
-CONFIG_COMMON_CLK_HI3519=y
+CONFIG_CLK_RASPBERRYPI=m
+# CONFIG_COMMON_CLK_HI3516CV300 is not set
+CONFIG_COMMON_CLK_HI3519=m
 CONFIG_COMMON_CLK_HI3660=y
 CONFIG_COMMON_CLK_HI3670=y
 CONFIG_COMMON_CLK_HI3798CV200=m
 CONFIG_COMMON_CLK_HI6220=y
 CONFIG_RESET_HISI=y
 CONFIG_STUB_CLK_HI6220=y
-# CONFIG_STUB_CLK_HI3660 is not set
+CONFIG_STUB_CLK_HI3660=y
 CONFIG_MXC_CLK=y
-# CONFIG_CLK_IMX8MM is not set
-# CONFIG_CLK_IMX8MN is not set
-# CONFIG_CLK_IMX8MQ is not set
-# CONFIG_CLK_IMX8QXP is not set
+CONFIG_MXC_CLK_SCU=y
+CONFIG_CLK_IMX8MM=y
+CONFIG_CLK_IMX8MN=y
+CONFIG_CLK_IMX8MQ=y
+CONFIG_CLK_IMX8QXP=y
 
 #
 # Clock driver for MediaTek SoC
@@ -7725,51 +8417,53 @@ CONFIG_COMMON_CLK_MT2712_MMSYS=y
 CONFIG_COMMON_CLK_MT2712_VDECSYS=y
 CONFIG_COMMON_CLK_MT2712_VENCSYS=y
 CONFIG_COMMON_CLK_MT6779=y
-# CONFIG_COMMON_CLK_MT6779_MMSYS is not set
-# CONFIG_COMMON_CLK_MT6779_IMGSYS is not set
-# CONFIG_COMMON_CLK_MT6779_IPESYS is not set
-# CONFIG_COMMON_CLK_MT6779_CAMSYS is not set
-# CONFIG_COMMON_CLK_MT6779_VDECSYS is not set
-# CONFIG_COMMON_CLK_MT6779_VENCSYS is not set
-# CONFIG_COMMON_CLK_MT6779_MFGCFG is not set
-# CONFIG_COMMON_CLK_MT6779_AUDSYS is not set
+CONFIG_COMMON_CLK_MT6779_MMSYS=y
+CONFIG_COMMON_CLK_MT6779_IMGSYS=y
+CONFIG_COMMON_CLK_MT6779_IPESYS=y
+CONFIG_COMMON_CLK_MT6779_CAMSYS=y
+CONFIG_COMMON_CLK_MT6779_VDECSYS=y
+CONFIG_COMMON_CLK_MT6779_VENCSYS=y
+CONFIG_COMMON_CLK_MT6779_MFGCFG=y
+CONFIG_COMMON_CLK_MT6779_AUDSYS=y
 CONFIG_COMMON_CLK_MT6797=y
-# CONFIG_COMMON_CLK_MT6797_MMSYS is not set
-# CONFIG_COMMON_CLK_MT6797_IMGSYS is not set
-# CONFIG_COMMON_CLK_MT6797_VDECSYS is not set
-# CONFIG_COMMON_CLK_MT6797_VENCSYS is not set
+CONFIG_COMMON_CLK_MT6797_MMSYS=y
+CONFIG_COMMON_CLK_MT6797_IMGSYS=y
+CONFIG_COMMON_CLK_MT6797_VDECSYS=y
+CONFIG_COMMON_CLK_MT6797_VENCSYS=y
 CONFIG_COMMON_CLK_MT7622=y
 CONFIG_COMMON_CLK_MT7622_ETHSYS=y
 CONFIG_COMMON_CLK_MT7622_HIFSYS=y
 CONFIG_COMMON_CLK_MT7622_AUDSYS=y
 CONFIG_COMMON_CLK_MT8173=y
 CONFIG_COMMON_CLK_MT8183=y
-# CONFIG_COMMON_CLK_MT8183_AUDIOSYS is not set
-# CONFIG_COMMON_CLK_MT8183_CAMSYS is not set
-# CONFIG_COMMON_CLK_MT8183_IMGSYS is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_CORE0 is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_CORE1 is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_ADL is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_CONN is not set
-# CONFIG_COMMON_CLK_MT8183_MFGCFG is not set
-# CONFIG_COMMON_CLK_MT8183_MMSYS is not set
-# CONFIG_COMMON_CLK_MT8183_VDECSYS is not set
-# CONFIG_COMMON_CLK_MT8183_VENCSYS is not set
+CONFIG_COMMON_CLK_MT8183_AUDIOSYS=y
+CONFIG_COMMON_CLK_MT8183_CAMSYS=y
+CONFIG_COMMON_CLK_MT8183_IMGSYS=y
+CONFIG_COMMON_CLK_MT8183_IPU_CORE0=y
+CONFIG_COMMON_CLK_MT8183_IPU_CORE1=y
+CONFIG_COMMON_CLK_MT8183_IPU_ADL=y
+CONFIG_COMMON_CLK_MT8183_IPU_CONN=y
+CONFIG_COMMON_CLK_MT8183_MFGCFG=y
+CONFIG_COMMON_CLK_MT8183_MMSYS=y
+CONFIG_COMMON_CLK_MT8183_VDECSYS=y
+CONFIG_COMMON_CLK_MT8183_VENCSYS=y
 CONFIG_COMMON_CLK_MT8516=y
-# CONFIG_COMMON_CLK_MT8516_AUDSYS is not set
+CONFIG_COMMON_CLK_MT8516_AUDSYS=y
 # end of Clock driver for MediaTek SoC
 
 CONFIG_COMMON_CLK_MESON_REGMAP=y
 CONFIG_COMMON_CLK_MESON_DUALDIV=y
 CONFIG_COMMON_CLK_MESON_MPLL=y
+CONFIG_COMMON_CLK_MESON_PHASE=m
 CONFIG_COMMON_CLK_MESON_PLL=y
+CONFIG_COMMON_CLK_MESON_SCLK_DIV=m
 CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y
 CONFIG_COMMON_CLK_MESON_AO_CLKC=y
 CONFIG_COMMON_CLK_MESON_EE_CLKC=y
 CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y
 CONFIG_COMMON_CLK_GXBB=y
 CONFIG_COMMON_CLK_AXG=y
-# CONFIG_COMMON_CLK_AXG_AUDIO is not set
+CONFIG_COMMON_CLK_AXG_AUDIO=m
 CONFIG_COMMON_CLK_G12A=y
 CONFIG_ARMADA_AP_CP_HELPER=y
 CONFIG_ARMADA_37XX_CLK=y
@@ -7777,10 +8471,12 @@ CONFIG_ARMADA_AP806_SYSCON=y
 CONFIG_ARMADA_CP110_SYSCON=y
 CONFIG_QCOM_GDSC=y
 CONFIG_QCOM_RPMCC=y
-CONFIG_COMMON_CLK_QCOM=y
-CONFIG_QCOM_A53PLL=y
+CONFIG_COMMON_CLK_QCOM=m
+CONFIG_QCOM_A53PLL=m
+CONFIG_QCOM_CLK_APCS_MSM8916=m
 CONFIG_QCOM_CLK_RPM=m
 CONFIG_QCOM_CLK_SMD_RPM=m
+CONFIG_QCOM_CLK_RPMH=m
 # CONFIG_APQ_GCC_8084 is not set
 # CONFIG_APQ_MMCC_8084 is not set
 # CONFIG_IPQ_GCC_4019 is not set
@@ -7788,48 +8484,36 @@ CONFIG_QCOM_CLK_SMD_RPM=m
 # CONFIG_IPQ_LCC_806X is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_MSM_GCC_8660 is not set
-CONFIG_MSM_GCC_8916=y
-CONFIG_MSM_GCC_8960=y
-CONFIG_MSM_LCC_8960=y
+CONFIG_MSM_GCC_8916=m
+# CONFIG_MSM_GCC_8960 is not set
+# CONFIG_MSM_LCC_8960 is not set
 # CONFIG_MDM_GCC_9615 is not set
 # CONFIG_MDM_LCC_9615 is not set
 # CONFIG_MSM_MMCC_8960 is not set
 # CONFIG_MSM_GCC_8974 is not set
 # CONFIG_MSM_MMCC_8974 is not set
-CONFIG_MSM_GCC_8994=m
-CONFIG_MSM_GCC_8996=y
-CONFIG_MSM_MMCC_8996=y
-# CONFIG_MSM_GCC_8998 is not set
+# CONFIG_MSM_GCC_8994 is not set
+# CONFIG_MSM_GCC_8996 is not set
+# CONFIG_MSM_MMCC_8996 is not set
+CONFIG_MSM_GCC_8998=m
 CONFIG_QCS_GCC_404=m
 CONFIG_SDM_CAMCC_845=m
-CONFIG_SDM_GCC_660=m
-# CONFIG_QCS_TURING_404 is not set
+# CONFIG_SDM_GCC_660 is not set
+CONFIG_QCS_TURING_404=m
 CONFIG_SDM_GCC_845=m
 CONFIG_SDM_GPUCC_845=m
-# CONFIG_SDM_VIDEOCC_845 is not set
-# CONFIG_SDM_DISPCC_845 is not set
+CONFIG_SDM_VIDEOCC_845=m
+CONFIG_SDM_DISPCC_845=m
 CONFIG_SDM_LPASSCC_845=m
 CONFIG_SM_GCC_8150=m
-# CONFIG_SPMI_PMIC_CLKDIV is not set
+CONFIG_SPMI_PMIC_CLKDIV=m
 CONFIG_QCOM_HFPLL=m
-CONFIG_KPSS_XCC=m
-CONFIG_CLK_RENESAS=y
-CONFIG_CLK_R8A774A1=y
-CONFIG_CLK_R8A774C0=y
-CONFIG_CLK_R8A7795=y
-CONFIG_CLK_R8A7796=y
-CONFIG_CLK_R8A77970=y
-CONFIG_CLK_R8A77995=y
-# CONFIG_CLK_R9A06G032 is not set
-CONFIG_CLK_RCAR_GEN3_CPG=y
-# CONFIG_CLK_RCAR_USB2_CLOCK_SEL is not set
-CONFIG_CLK_RENESAS_CPG_MSSR=y
-CONFIG_CLK_RENESAS_DIV6=y
+# CONFIG_KPSS_XCC is not set
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_ARM64_COMMON_CLK=y
-CONFIG_EXYNOS_AUDSS_CLK_CON=y
-CONFIG_SPRD_COMMON_CLK=y
-CONFIG_SPRD_SC9860_CLK=y
+CONFIG_EXYNOS_AUDSS_CLK_CON=m
+CONFIG_SPRD_COMMON_CLK=m
+CONFIG_SPRD_SC9860_CLK=m
 CONFIG_CLK_SUNXI=y
 CONFIG_CLK_SUNXI_CLOCKS=y
 CONFIG_CLK_SUNXI_PRCM_SUN6I=y
@@ -7840,18 +8524,17 @@ CONFIG_SUN50I_A64_CCU=y
 CONFIG_SUN50I_H6_CCU=y
 CONFIG_SUN50I_H6_R_CCU=y
 # CONFIG_SUN8I_A83T_CCU is not set
-# CONFIG_SUN8I_H3_CCU is not set
-# CONFIG_SUN8I_DE2_CCU is not set
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_DE2_CCU=y
 CONFIG_SUN8I_R_CCU=y
 CONFIG_CLK_TEGRA_BPMP=y
 CONFIG_TEGRA_CLK_DFLL=y
-CONFIG_CLK_UNIPHIER=y
-# CONFIG_COMMON_CLK_ZYNQMP is not set
+CONFIG_COMMON_CLK_ZYNQMP=y
 # end of Common Clock Framework
 
 CONFIG_HWSPINLOCK=y
-CONFIG_HWSPINLOCK_QCOM=y
-# CONFIG_HWSPINLOCK_SPRD is not set
+CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_HWSPINLOCK_SPRD=m
 
 #
 # Clock Source drivers
@@ -7871,36 +8554,32 @@ CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
 CONFIG_ARM_TIMER_SP804=y
-CONFIG_SYS_SUPPORTS_SH_CMT=y
 CONFIG_MTK_TIMER=y
 CONFIG_SPRD_TIMER=y
-CONFIG_SYS_SUPPORTS_SH_TMU=y
-CONFIG_SH_TIMER_CMT=y
-CONFIG_SH_TIMER_TMU=y
 CONFIG_CLKSRC_VERSATILE=y
 CONFIG_TIMER_IMX_SYS_CTR=y
 # end of Clock Source drivers
 
 CONFIG_MAILBOX=y
-CONFIG_ARM_MHU=y
+# CONFIG_ARM_MHU is not set
 CONFIG_IMX_MBOX=m
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
 # CONFIG_PL320_MBOX is not set
 CONFIG_ARMADA_37XX_RWTM_MBOX=m
-# CONFIG_ROCKCHIP_MBOX is not set
+CONFIG_ROCKCHIP_MBOX=y
 CONFIG_PCC=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_BCM2835_MBOX=y
-# CONFIG_HI3660_MBOX is not set
-CONFIG_HI6220_MBOX=y
+CONFIG_HI3660_MBOX=m
+CONFIG_HI6220_MBOX=m
 # CONFIG_MAILBOX_TEST is not set
-# CONFIG_QCOM_APCS_IPC is not set
+CONFIG_QCOM_APCS_IPC=m
 CONFIG_TEGRA_HSP_MBOX=y
-# CONFIG_XGENE_SLIMPRO_MBOX is not set
-# CONFIG_BCM_PDC_MBOX is not set
+CONFIG_XGENE_SLIMPRO_MBOX=m
+CONFIG_BCM_PDC_MBOX=m
 CONFIG_BCM_FLEXRM_MBOX=m
 CONFIG_MTK_CMDQ_MBOX=m
-# CONFIG_ZYNQMP_IPI_MBOX is not set
+CONFIG_ZYNQMP_IPI_MBOX=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
@@ -7916,33 +8595,33 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # end of Generic IOMMU Pagetable Support
 
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
-# CONFIG_ROCKCHIP_IOMMU is not set
-# CONFIG_TEGRA_IOMMU_SMMU is not set
-# CONFIG_EXYNOS_IOMMU is not set
-# CONFIG_IPMMU_VMSA is not set
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_EXYNOS_IOMMU=y
+# CONFIG_EXYNOS_IOMMU_DEBUG is not set
 CONFIG_ARM_SMMU=y
-CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
+# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set
 CONFIG_ARM_SMMU_V3=y
 CONFIG_MTK_IOMMU=y
 CONFIG_QCOM_IOMMU=y
-# CONFIG_VIRTIO_IOMMU is not set
+CONFIG_VIRTIO_IOMMU=y
 
 #
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=y
-# CONFIG_IMX_REMOTEPROC is not set
+CONFIG_IMX_REMOTEPROC=m
 CONFIG_QCOM_RPROC_COMMON=m
 CONFIG_QCOM_Q6V5_COMMON=m
 CONFIG_QCOM_Q6V5_ADSP=m
 CONFIG_QCOM_Q6V5_MSS=m
 CONFIG_QCOM_Q6V5_PAS=m
-# CONFIG_QCOM_Q6V5_WCSS is not set
-# CONFIG_QCOM_SYSMON is not set
-CONFIG_QCOM_WCNSS_PIL=m
+CONFIG_QCOM_Q6V5_WCSS=m
+CONFIG_QCOM_SYSMON=m
+# CONFIG_QCOM_WCNSS_PIL is not set
 # end of Remoteproc drivers
 
 #
@@ -7951,18 +8630,23 @@ CONFIG_QCOM_WCNSS_PIL=m
 CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
 CONFIG_RPMSG_QCOM_GLINK_SMEM=m
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPMSG_VIRTIO=m
 # end of Rpmsg drivers
 
-# CONFIG_SOUNDWIRE is not set
+CONFIG_SOUNDWIRE=y
+
+#
+# SoundWire Devices
+#
 
 #
 # SOC (System On Chip) specific Drivers
 #
-# CONFIG_OWL_PM_DOMAINS is not set
+CONFIG_OWL_PM_DOMAINS_HELPER=y
+CONFIG_OWL_PM_DOMAINS=y
 
 #
 # Amlogic SoC drivers
@@ -7972,7 +8656,7 @@ CONFIG_MESON_CLK_MEASURE=y
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_GX_PM_DOMAINS=y
 CONFIG_MESON_EE_PM_DOMAINS=y
-CONFIG_MESON_MX_SOCINFO=y
+# CONFIG_MESON_MX_SOCINFO is not set
 # end of Amlogic SoC drivers
 
 #
@@ -7996,14 +8680,16 @@ CONFIG_FSL_DPAA=y
 # CONFIG_FSL_DPAA_CHECKING is not set
 # CONFIG_FSL_BMAN_TEST is not set
 # CONFIG_FSL_QMAN_TEST is not set
-CONFIG_DPAA2_CONSOLE=y
+CONFIG_FSL_GUTS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_DPAA2_CONSOLE=m
 # end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
-# CONFIG_IMX_SCU_SOC is not set
+CONFIG_IMX_SCU_SOC=y
 # end of i.MX SoC drivers
 
 #
@@ -8011,51 +8697,35 @@ CONFIG_IMX_GPCV2_PM_DOMAINS=y
 #
 CONFIG_MTK_CMDQ=m
 CONFIG_MTK_INFRACFG=y
-CONFIG_MTK_PMIC_WRAP=y
+CONFIG_MTK_PMIC_WRAP=m
 CONFIG_MTK_SCPSYS=y
 # end of MediaTek SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
-# CONFIG_QCOM_AOSS_QMP is not set
+CONFIG_QCOM_AOSS_QMP=m
 CONFIG_QCOM_COMMAND_DB=y
-# CONFIG_QCOM_GENI_SE is not set
+CONFIG_QCOM_GENI_SE=y
 CONFIG_QCOM_GLINK_SSR=m
-CONFIG_QCOM_GSBI=y
-# CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_LLCC=m
+CONFIG_QCOM_SDM845_LLCC=m
 CONFIG_QCOM_MDT_LOADER=m
+CONFIG_QCOM_QMI_HELPERS=m
 CONFIG_QCOM_RMTFS_MEM=m
-# CONFIG_QCOM_RPMH is not set
-CONFIG_QCOM_SMEM=y
+CONFIG_QCOM_RPMH=y
+CONFIG_QCOM_RPMHPD=y
+CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_SMEM_STATE=y
-CONFIG_QCOM_SMP2P=y
-CONFIG_QCOM_SMSM=y
+CONFIG_QCOM_SMP2P=m
+CONFIG_QCOM_SMSM=m
 CONFIG_QCOM_SOCINFO=m
 CONFIG_QCOM_WCNSS_CTRL=m
-# CONFIG_QCOM_APR is not set
+CONFIG_QCOM_APR=m
 # end of Qualcomm SoC drivers
 
-CONFIG_SOC_RENESAS=y
-CONFIG_ARCH_RCAR_GEN3=y
-CONFIG_ARCH_R8A774A1=y
-CONFIG_ARCH_R8A774C0=y
-CONFIG_ARCH_R8A7795=y
-CONFIG_ARCH_R8A7796=y
-# CONFIG_ARCH_R8A77965 is not set
-CONFIG_ARCH_R8A77970=y
-# CONFIG_ARCH_R8A77980 is not set
-# CONFIG_ARCH_R8A77990 is not set
-CONFIG_ARCH_R8A77995=y
-CONFIG_SYSC_R8A774A1=y
-CONFIG_SYSC_R8A774C0=y
-CONFIG_SYSC_R8A7795=y
-CONFIG_SYSC_R8A7796=y
-CONFIG_SYSC_R8A77970=y
-CONFIG_SYSC_R8A77995=y
-CONFIG_RST_RCAR=y
-CONFIG_SYSC_RCAR=y
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
@@ -8066,22 +8736,23 @@ CONFIG_SUNXI_SRAM=y
 CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 CONFIG_ARCH_TEGRA_186_SOC=y
-# CONFIG_ARCH_TEGRA_194_SOC is not set
+CONFIG_ARCH_TEGRA_194_SOC=y
 CONFIG_SOC_TEGRA_FUSE=y
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 CONFIG_SOC_TEGRA_PMC=y
 CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
 
 #
 # Xilinx SoC drivers
 #
-# CONFIG_XILINX_VCU is not set
+CONFIG_XILINX_VCU=m
 CONFIG_ZYNQMP_POWER=y
 CONFIG_ZYNQMP_PM_DOMAINS=y
 # end of Xilinx SoC drivers
 
-# CONFIG_SOC_ZTE is not set
+CONFIG_SOC_ZTE=y
+CONFIG_ZX2967_PM_DOMAINS=y
 # end of SOC (System On Chip) specific Drivers
 
 CONFIG_PM_DEVFREQ=y
@@ -8089,45 +8760,48 @@ CONFIG_PM_DEVFREQ=y
 #
 # DEVFREQ Governors
 #
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
-# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
-# CONFIG_DEVFREQ_GOV_USERSPACE is not set
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=m
+CONFIG_DEVFREQ_GOV_POWERSAVE=m
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_DEVFREQ_GOV_PASSIVE=y
 
 #
 # DEVFREQ Drivers
 #
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y
 CONFIG_ARM_TEGRA_DEVFREQ=m
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
-# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=y
+CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
 CONFIG_EXTCON=y
 
 #
 # Extcon Device Drivers
 #
-CONFIG_EXTCON_ADC_JACK=m
-# CONFIG_EXTCON_FSA9480 is not set
-CONFIG_EXTCON_GPIO=y
-# CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_ADC_JACK is not set
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_MAX3355=m
 CONFIG_EXTCON_PTN5150=m
-CONFIG_EXTCON_QCOM_SPMI_MISC=y
+CONFIG_EXTCON_QCOM_SPMI_MISC=m
 # CONFIG_EXTCON_RT8973A is not set
-# CONFIG_EXTCON_SM5502 is not set
-CONFIG_EXTCON_USB_GPIO=y
+CONFIG_EXTCON_SM5502=m
+# CONFIG_EXTCON_USB_GPIO is not set
 CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_MEMORY=y
-# CONFIG_ARM_PL172_MPMC is not set
+CONFIG_ARM_PL172_MPMC=m
 CONFIG_FSL_IFC=y
 CONFIG_MTK_SMI=y
 CONFIG_TEGRA_MC=y
-CONFIG_IIO=y
+CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
-CONFIG_IIO_BUFFER_CB=y
-# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
-CONFIG_IIO_KFIFO_BUF=y
-CONFIG_IIO_TRIGGERED_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_CONFIGFS=m
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
@@ -8138,15 +8812,12 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 #
 # Accelerometers
 #
-CONFIG_ADIS16201=m
-CONFIG_ADIS16209=m
-CONFIG_ADXL345=m
-CONFIG_ADXL345_I2C=m
-CONFIG_ADXL345_SPI=m
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
 CONFIG_ADXL372=m
 CONFIG_ADXL372_SPI=m
 CONFIG_ADXL372_I2C=m
-CONFIG_BMA180=m
+# CONFIG_BMA180 is not set
 CONFIG_BMA220=m
 CONFIG_BMC150_ACCEL=m
 CONFIG_BMC150_ACCEL_I2C=m
@@ -8158,25 +8829,21 @@ CONFIG_DMARD09=m
 CONFIG_DMARD10=m
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
-CONFIG_KXSD9=m
-CONFIG_KXSD9_SPI=m
-CONFIG_KXSD9_I2C=m
-CONFIG_KXCJK1013=m
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
 CONFIG_MC3230=m
 CONFIG_MMA7455=m
 CONFIG_MMA7455_I2C=m
 CONFIG_MMA7455_SPI=m
 CONFIG_MMA7660=m
-CONFIG_MMA8452=m
+# CONFIG_MMA8452 is not set
 CONFIG_MMA9551_CORE=m
 CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
 CONFIG_MXC6255=m
-CONFIG_SCA3000=m
+# CONFIG_SCA3000 is not set
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
 # end of Accelerometers
@@ -8186,81 +8853,86 @@ CONFIG_STK8BA50=m
 #
 CONFIG_AD_SIGMA_DELTA=m
 CONFIG_AD7124=m
-CONFIG_AD7266=m
-CONFIG_AD7291=m
-CONFIG_AD7298=m
-CONFIG_AD7476=m
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
 CONFIG_AD7606=m
 CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
-CONFIG_AD7780=m
-CONFIG_AD7791=m
-CONFIG_AD7793=m
-CONFIG_AD7887=m
-CONFIG_AD7923=m
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
 CONFIG_AD7949=m
-CONFIG_AD799X=m
-# CONFIG_BCM_IPROC_ADC is not set
+# CONFIG_AD799X is not set
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+CONFIG_BCM_IPROC_ADC=m
 # CONFIG_BERLIN2_ADC is not set
-CONFIG_CC10001_ADC=m
+# CONFIG_CC10001_ADC is not set
+CONFIG_CPCAP_ADC=m
+CONFIG_DLN2_ADC=m
 CONFIG_ENVELOPE_DETECTOR=m
 # CONFIG_EXYNOS_ADC is not set
 CONFIG_HI8435=m
-# CONFIG_HX711 is not set
+CONFIG_HX711=m
 CONFIG_INA2XX_ADC=m
-CONFIG_IMX7D_ADC=m
+# CONFIG_IMX7D_ADC is not set
 CONFIG_LTC2471=m
 CONFIG_LTC2485=m
 CONFIG_LTC2497=m
-CONFIG_MAX1027=m
-# CONFIG_MAX11100 is not set
+# CONFIG_MAX1027 is not set
+CONFIG_MAX11100=m
 CONFIG_MAX1118=m
-CONFIG_MAX1363=m
+# CONFIG_MAX1363 is not set
 CONFIG_MAX9611=m
-CONFIG_MCP320X=m
-CONFIG_MCP3422=m
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
 CONFIG_MCP3911=m
 CONFIG_MEDIATEK_MT6577_AUXADC=m
-CONFIG_MESON_SARADC=y
-CONFIG_NAU7802=m
-CONFIG_QCOM_VADC_COMMON=y
-CONFIG_QCOM_SPMI_IADC=y
-CONFIG_QCOM_SPMI_VADC=y
+CONFIG_MESON_SARADC=m
+# CONFIG_NAU7802 is not set
+CONFIG_QCOM_VADC_COMMON=m
+# CONFIG_QCOM_SPMI_IADC is not set
+# CONFIG_QCOM_SPMI_VADC is not set
 CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_ROCKCHIP_SARADC is not set
-# CONFIG_SC27XX_ADC is not set
-# CONFIG_SD_ADC_MODULATOR is not set
+CONFIG_SC27XX_ADC=m
+CONFIG_SD_ADC_MODULATOR=m
 CONFIG_SUN4I_GPADC=m
-CONFIG_TI_ADC081C=m
+# CONFIG_TI_ADC081C is not set
 CONFIG_TI_ADC0832=m
-# CONFIG_TI_ADC084S021 is not set
+CONFIG_TI_ADC084S021=m
 CONFIG_TI_ADC12138=m
-# CONFIG_TI_ADC108S102 is not set
-CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC108S102=m
+# CONFIG_TI_ADC128S052 is not set
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
-# CONFIG_TI_ADS7950 is not set
+CONFIG_TI_ADS7950=m
 CONFIG_TI_ADS8344=m
-CONFIG_TI_ADS8688=m
+# CONFIG_TI_ADS8688 is not set
 CONFIG_TI_ADS124S08=m
-# CONFIG_TI_TLC4541 is not set
-CONFIG_VF610_ADC=m
-CONFIG_VIPERBOARD_ADC=m
-# CONFIG_XILINX_XADC is not set
+# CONFIG_TI_AM335X_ADC is not set
+CONFIG_TI_TLC4541=m
+# CONFIG_VF610_ADC is not set
+# CONFIG_VIPERBOARD_ADC is not set
+CONFIG_XILINX_XADC=m
 # end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
-# CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE=m
 # end of Analog Front Ends
 
 #
 # Amplifiers
 #
-CONFIG_AD8366=m
+# CONFIG_AD8366 is not set
 # end of Amplifiers
 
 #
@@ -8272,14 +8944,15 @@ CONFIG_BME680_I2C=m
 CONFIG_BME680_SPI=m
 CONFIG_CCS811=m
 CONFIG_IAQCORE=m
-CONFIG_SENSIRION_SGP30=m
+CONFIG_PMS7003=m
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
 # end of Chemical Sensors
 
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 CONFIG_IIO_CROS_EC_SENSORS=m
-# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
+CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
 
 #
 # Hid Sensor IIO Common
@@ -8303,40 +8976,41 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # Digital to analog converters
 #
-CONFIG_AD5064=m
-CONFIG_AD5360=m
-CONFIG_AD5380=m
-CONFIG_AD5421=m
-CONFIG_AD5446=m
-CONFIG_AD5449=m
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
 CONFIG_AD5592R_BASE=m
 CONFIG_AD5592R=m
-CONFIG_AD5593R=m
-CONFIG_AD5504=m
-CONFIG_AD5624R_SPI=m
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
 CONFIG_LTC1660=m
 CONFIG_LTC2632=m
-# CONFIG_AD5686_SPI is not set
-# CONFIG_AD5696_I2C is not set
-CONFIG_AD5755=m
-# CONFIG_AD5758 is not set
+CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
+# CONFIG_AD5755 is not set
+CONFIG_AD5758=m
 CONFIG_AD5761=m
-CONFIG_AD5764=m
-CONFIG_AD5791=m
-CONFIG_AD7303=m
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
 CONFIG_AD8801=m
 CONFIG_DPOT_DAC=m
 CONFIG_DS4424=m
 CONFIG_M62332=m
-CONFIG_MAX517=m
-CONFIG_MAX5821=m
-CONFIG_MCP4725=m
-CONFIG_MCP4922=m
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
 CONFIG_TI_DAC082S085=m
-# CONFIG_TI_DAC5571 is not set
+CONFIG_TI_DAC5571=m
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
-CONFIG_VF610_DAC=m
+# CONFIG_VF610_DAC is not set
 # end of Digital to analog converters
 
 #
@@ -8352,37 +9026,34 @@ CONFIG_VF610_DAC=m
 #
 # Clock Generator/Distribution
 #
-CONFIG_AD9523=m
+# CONFIG_AD9523 is not set
 # end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
-CONFIG_ADF4350=m
-# CONFIG_ADF4371 is not set
+# CONFIG_ADF4350 is not set
+CONFIG_ADF4371=m
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
 #
-CONFIG_ADIS16080=m
-CONFIG_ADIS16130=m
-CONFIG_ADIS16136=m
-CONFIG_ADIS16260=m
-CONFIG_ADXRS450=m
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_BMG160_SPI=m
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
 CONFIG_FXAS21002C=m
 CONFIG_FXAS21002C_I2C=m
 CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
-# CONFIG_MPU3050_I2C is not set
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
-CONFIG_ITG3200=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
 # end of Digital gyroscope sensors
 
 #
@@ -8403,23 +9074,23 @@ CONFIG_MAX30102=m
 # Humidity sensors
 #
 CONFIG_AM2315=m
-CONFIG_DHT11=m
+# CONFIG_DHT11 is not set
 CONFIG_HDC100X=m
 CONFIG_HID_SENSOR_HUMIDITY=m
 CONFIG_HTS221=m
 CONFIG_HTS221_I2C=m
 CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
 # end of Humidity sensors
 
 #
 # Inertial measurement units
 #
-CONFIG_ADIS16400=m
-# CONFIG_ADIS16460 is not set
-CONFIG_ADIS16480=m
+# CONFIG_ADIS16400 is not set
+CONFIG_ADIS16460=m
+# CONFIG_ADIS16480 is not set
 CONFIG_BMI160=m
 CONFIG_BMI160_I2C=m
 CONFIG_BMI160_SPI=m
@@ -8427,7 +9098,10 @@ CONFIG_KMX61=m
 CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
 CONFIG_INV_MPU6050_SPI=m
-# CONFIG_IIO_ST_LSM6DSX is not set
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
+CONFIG_IIO_ST_LSM6DSX_I3C=m
 # end of Inertial measurement units
 
 CONFIG_IIO_ADIS_LIB=m
@@ -8436,70 +9110,69 @@ CONFIG_IIO_ADIS_LIB_BUFFER=y
 #
 # Light sensors
 #
-CONFIG_ACPI_ALS=m
-CONFIG_ADJD_S311=m
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
+# CONFIG_ACPI_ALS is not set
+# CONFIG_ADJD_S311 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
 CONFIG_APDS9960=m
-CONFIG_BH1750=m
-CONFIG_BH1780=m
-CONFIG_CM32181=m
+# CONFIG_BH1750 is not set
+# CONFIG_BH1780 is not set
+# CONFIG_CM32181 is not set
 CONFIG_CM3232=m
 CONFIG_CM3323=m
-# CONFIG_CM3605 is not set
-CONFIG_CM36651=m
+CONFIG_CM3605=m
+# CONFIG_CM36651 is not set
 CONFIG_IIO_CROS_EC_LIGHT_PROX=m
-CONFIG_GP2AP020A00F=m
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_ISL29125=m
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_PROX=m
 CONFIG_JSA1212=m
 CONFIG_RPR0521=m
-CONFIG_LTR501=m
-# CONFIG_LV0104CS is not set
-CONFIG_MAX44000=m
+# CONFIG_SENSORS_LM3533 is not set
+# CONFIG_LTR501 is not set
+CONFIG_LV0104CS=m
+# CONFIG_MAX44000 is not set
 CONFIG_MAX44009=m
 CONFIG_NOA1305=m
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
-# CONFIG_SI1133 is not set
+CONFIG_SI1133=m
 CONFIG_SI1145=m
-CONFIG_STK3310=m
-# CONFIG_ST_UVIS25 is not set
-CONFIG_TCS3414=m
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL2583=m
-# CONFIG_TSL2772 is not set
-CONFIG_TSL4531=m
+# CONFIG_STK3310 is not set
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+CONFIG_TSL2772=m
+# CONFIG_TSL4531 is not set
 CONFIG_US5182D=m
-CONFIG_VCNL4000=m
+# CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
-CONFIG_VEML6070=m
+# CONFIG_VEML6070 is not set
 CONFIG_VL6180=m
-# CONFIG_ZOPT2201 is not set
+CONFIG_ZOPT2201=m
 # end of Light sensors
 
 #
 # Magnetometer sensors
 #
 CONFIG_AK8974=m
-CONFIG_AK8975=m
-CONFIG_AK09911=m
-CONFIG_BMC150_MAGN=m
-CONFIG_BMC150_MAGN_I2C=m
-CONFIG_BMC150_MAGN_SPI=m
-CONFIG_MAG3110=m
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-CONFIG_SENSORS_HMC5843_SPI=m
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
@@ -8508,7 +9181,7 @@ CONFIG_SENSORS_RM3100_SPI=m
 #
 # Multiplexers
 #
-# CONFIG_IIO_MUX is not set
+CONFIG_IIO_MUX=m
 # end of Multiplexers
 
 #
@@ -8522,21 +9195,21 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # Triggers - standalone
 #
 CONFIG_IIO_HRTIMER_TRIGGER=m
-CONFIG_IIO_INTERRUPT_TRIGGER=m
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
+# CONFIG_IIO_SYSFS_TRIGGER is not set
 # end of Triggers - standalone
 
 #
 # Digital potentiometers
 #
-# CONFIG_AD5272 is not set
-CONFIG_DS1803=m
+CONFIG_AD5272=m
+# CONFIG_DS1803 is not set
 CONFIG_MAX5432=m
-# CONFIG_MAX5481 is not set
+CONFIG_MAX5481=m
 CONFIG_MAX5487=m
-# CONFIG_MCP4018 is not set
-CONFIG_MCP4131=m
+CONFIG_MCP4018=m
+# CONFIG_MCP4131 is not set
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
@@ -8555,23 +9228,21 @@ CONFIG_ABP060MG=m
 CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
-# CONFIG_IIO_CROS_EC_BARO is not set
-# CONFIG_DPS310 is not set
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_DPS310=m
 CONFIG_HID_SENSOR_PRESS=m
-CONFIG_HP03=m
+# CONFIG_HP03 is not set
 CONFIG_MPL115=m
 CONFIG_MPL115_I2C=m
 CONFIG_MPL115_SPI=m
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5611_SPI=m
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
 CONFIG_MS5637=m
 CONFIG_IIO_ST_PRESS=m
 CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
-CONFIG_T5403=m
-CONFIG_HP206C=m
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
@@ -8580,27 +9251,27 @@ CONFIG_ZPA2326_SPI=m
 #
 # Lightning sensors
 #
-CONFIG_AS3935=m
+# CONFIG_AS3935 is not set
 # end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
-# CONFIG_ISL29501 is not set
+CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
 CONFIG_MB1232=m
 CONFIG_RFD77402=m
 CONFIG_SRF04=m
 CONFIG_SX9500=m
-# CONFIG_SRF08 is not set
+CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
 # end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
-CONFIG_AD2S90=m
-CONFIG_AD2S1200=m
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
 # end of Resolver to digital converters
 
 #
@@ -8608,40 +9279,48 @@ CONFIG_AD2S1200=m
 #
 CONFIG_MAXIM_THERMOCOUPLE=m
 CONFIG_HID_SENSOR_TEMP=m
-CONFIG_MLX90614=m
-# CONFIG_MLX90632 is not set
-CONFIG_TMP006=m
-# CONFIG_TMP007 is not set
+# CONFIG_MLX90614 is not set
+CONFIG_MLX90632=m
+# CONFIG_TMP006 is not set
+CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
 CONFIG_MAX31856=m
 # end of Temperature sensors
 
-# CONFIG_NTB is not set
+CONFIG_NTB=y
+CONFIG_NTB_MSI=y
+CONFIG_NTB_IDT=m
+CONFIG_NTB_SWITCHTEC=m
+# CONFIG_NTB_PINGPONG is not set
+# CONFIG_NTB_TOOL is not set
+CONFIG_NTB_PERF=m
+# CONFIG_NTB_MSI_TEST is not set
+CONFIG_NTB_TRANSPORT=m
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
-CONFIG_PWM_BCM_IPROC=y
+CONFIG_PWM_ATMEL_HLCDC_PWM=m
+CONFIG_PWM_BCM_IPROC=m
 CONFIG_PWM_BCM2835=m
-# CONFIG_PWM_BERLIN is not set
-# CONFIG_PWM_BRCMSTB is not set
+CONFIG_PWM_BERLIN=m
+CONFIG_PWM_BRCMSTB=m
 CONFIG_PWM_CROS_EC=m
 # CONFIG_PWM_FSL_FTM is not set
 CONFIG_PWM_HIBVT=m
-CONFIG_PWM_IMX1=m
-CONFIG_PWM_IMX27=m
+# CONFIG_PWM_IMX1 is not set
+# CONFIG_PWM_IMX27 is not set
 CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_LP3943=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_MTK_DISP=m
 CONFIG_PWM_MEDIATEK=m
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_RCAR is not set
-# CONFIG_PWM_RENESAS_TPU is not set
-# CONFIG_PWM_ROCKCHIP is not set
-# CONFIG_PWM_SAMSUNG is not set
+CONFIG_PWM_ROCKCHIP=m
+CONFIG_PWM_SAMSUNG=m
 CONFIG_PWM_SPRD=m
 CONFIG_PWM_SUN4I=m
-# CONFIG_PWM_TEGRA is not set
+CONFIG_PWM_TEGRA=m
 CONFIG_PWM_ZX=m
 
 #
@@ -8655,14 +9334,14 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_ARM_GIC_V3_ITS_FSL_MC=y
 CONFIG_ALPINE_MSI=y
-# CONFIG_AL_FIC is not set
+CONFIG_AL_FIC=y
 CONFIG_BCM7038_L1_IRQ=y
 CONFIG_BRCMSTB_L2_IRQ=y
 CONFIG_DW_APB_ICTL=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
 CONFIG_MADERA_IRQ=m
-CONFIG_RENESAS_IRQC=y
 CONFIG_IMX_GPCV2=y
 CONFIG_MVEBU_GICP=y
 CONFIG_MVEBU_ICU=y
@@ -8671,30 +9350,30 @@ CONFIG_MVEBU_PIC=y
 CONFIG_MVEBU_SEI=y
 CONFIG_LS_SCFG_MSI=y
 CONFIG_PARTITION_PERCPU=y
-# CONFIG_QCOM_IRQ_COMBINER is not set
-CONFIG_IRQ_UNIPHIER_AIDET=y
+CONFIG_QCOM_IRQ_COMBINER=y
 CONFIG_MESON_IRQ_GPIO=y
-# CONFIG_QCOM_PDC is not set
+CONFIG_QCOM_PDC=y
 CONFIG_IMX_IRQSTEER=y
 # end of IRQ chip support
 
-# CONFIG_IPACK_BUS is not set
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_BERLIN=y
-CONFIG_RESET_BRCMSTB=y
+CONFIG_RESET_BRCMSTB=m
 CONFIG_RESET_IMX7=y
 CONFIG_RESET_MESON=y
-# CONFIG_RESET_MESON_AUDIO_ARB is not set
-# CONFIG_RESET_QCOM_AOSS is not set
+CONFIG_RESET_MESON_AUDIO_ARB=m
+CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_QCOM_PDC=m
+CONFIG_RESET_SCMI=m
 CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_SUNXI=y
-# CONFIG_RESET_TI_SYSCON is not set
-CONFIG_RESET_UNIPHIER=y
-CONFIG_RESET_UNIPHIER_GLUE=y
-CONFIG_COMMON_RESET_HI3660=y
-CONFIG_COMMON_RESET_HI6220=y
+CONFIG_RESET_TI_SYSCON=m
+CONFIG_COMMON_RESET_HI3660=m
+CONFIG_COMMON_RESET_HI6220=m
 CONFIG_RESET_TEGRA_BPMP=y
 
 #
@@ -8702,76 +9381,70 @@ CONFIG_RESET_TEGRA_BPMP=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_PHY_XGENE=y
-# CONFIG_PHY_SUN4I_USB is not set
+CONFIG_PHY_XGENE=m
+CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
-# CONFIG_PHY_SUN9I_USB is not set
-CONFIG_PHY_MESON8B_USB2=y
-CONFIG_PHY_MESON_GXL_USB2=y
-CONFIG_PHY_MESON_GXL_USB3=y
+CONFIG_PHY_SUN9I_USB=m
+CONFIG_PHY_MESON8B_USB2=m
+CONFIG_PHY_MESON_GXL_USB2=m
+CONFIG_PHY_MESON_GXL_USB3=m
 CONFIG_PHY_MESON_G12A_USB2=m
-CONFIG_PHY_MESON_G12A_USB3_PCIE=y
-CONFIG_PHY_BCM_SR_USB=y
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_BCM_NS_USB2 is not set
-# CONFIG_PHY_BCM_NS_USB3 is not set
-CONFIG_PHY_NS2_PCIE=y
-CONFIG_PHY_NS2_USB_DRD=y
-CONFIG_PHY_BRCM_SATA=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
+CONFIG_PHY_BCM_SR_USB=m
+CONFIG_BCM_KONA_USB2_PHY=m
+CONFIG_PHY_BCM_NS_USB2=m
+CONFIG_PHY_BCM_NS_USB3=m
+CONFIG_PHY_NS2_PCIE=m
+CONFIG_PHY_NS2_USB_DRD=m
+CONFIG_PHY_BRCM_SATA=m
 CONFIG_PHY_BRCM_USB=m
-CONFIG_PHY_BCM_SR_PCIE=y
+CONFIG_PHY_BCM_SR_PCIE=m
 CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-CONFIG_PHY_HI6220_USB=y
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
+CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_HI3660_USB=m
-# CONFIG_PHY_HISTB_COMBPHY is not set
-# CONFIG_PHY_HISI_INNO_USB2 is not set
-# CONFIG_PHY_BERLIN_SATA is not set
-# CONFIG_PHY_BERLIN_USB is not set
+CONFIG_PHY_HISTB_COMBPHY=m
+CONFIG_PHY_HISI_INNO_USB2=m
+CONFIG_PHY_BERLIN_SATA=m
+CONFIG_PHY_BERLIN_USB=m
 CONFIG_PHY_MVEBU_A3700_COMPHY=m
-CONFIG_PHY_MVEBU_A3700_UTMI=y
+CONFIG_PHY_MVEBU_A3700_UTMI=m
 CONFIG_PHY_MVEBU_A38X_COMPHY=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
 CONFIG_PHY_MTK_TPHY=m
 CONFIG_PHY_MTK_UFS=m
-# CONFIG_PHY_MTK_XSPHY is not set
-# CONFIG_PHY_CPCAP_USB is not set
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+CONFIG_PHY_MTK_XSPHY=m
+CONFIG_PHY_CPCAP_USB=m
+CONFIG_PHY_MAPPHONE_MDM6600=m
 CONFIG_PHY_OCELOT_SERDES=m
-# CONFIG_PHY_QCOM_APQ8064_SATA is not set
-# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_PHY_QCOM_PCIE2=m
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
-CONFIG_PHY_QCOM_UFS=y
-CONFIG_PHY_QCOM_UFS_14NM=y
-# CONFIG_PHY_QCOM_USB_HS is not set
-# CONFIG_PHY_QCOM_USB_HSIC is not set
-# CONFIG_PHY_RCAR_GEN2 is not set
-# CONFIG_PHY_RCAR_GEN3_PCIE is not set
-# CONFIG_PHY_RCAR_GEN3_USB2 is not set
-# CONFIG_PHY_RCAR_GEN3_USB3 is not set
-# CONFIG_PHY_ROCKCHIP_DP is not set
-CONFIG_PHY_ROCKCHIP_EMMC=y
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_14NM=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
-# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set
+CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
-# CONFIG_PHY_ROCKCHIP_TYPEC is not set
+CONFIG_PHY_ROCKCHIP_TYPEC=m
 CONFIG_PHY_ROCKCHIP_USB=m
-CONFIG_PHY_EXYNOS_DP_VIDEO=y
-CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
-# CONFIG_PHY_EXYNOS_PCIE is not set
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_PHY_EXYNOS_PCIE=y
 # CONFIG_PHY_SAMSUNG_USB2 is not set
-CONFIG_PHY_EXYNOS5_USBDRD=y
-CONFIG_PHY_UNIPHIER_USB2=m
-CONFIG_PHY_UNIPHIER_USB3=m
-CONFIG_PHY_UNIPHIER_PCIE=m
-# CONFIG_PHY_TEGRA_XUSB is not set
+# CONFIG_PHY_EXYNOS5_USBDRD is not set
+CONFIG_PHY_TEGRA_XUSB=m
+CONFIG_PHY_TEGRA194_P2U=m
 # CONFIG_PHY_TUSB1210 is not set
 # end of PHY Subsystem
 
@@ -8784,17 +9457,18 @@ CONFIG_IDLE_INJECT=y
 #
 CONFIG_ARM_CCI_PMU=y
 CONFIG_ARM_CCI400_PMU=y
-# CONFIG_ARM_CCI5xx_PMU is not set
+CONFIG_ARM_CCI5xx_PMU=y
 CONFIG_ARM_CCN=y
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
 CONFIG_ARM_SMMU_V3_PMU=m
-# CONFIG_ARM_DSU_PMU is not set
-# CONFIG_FSL_IMX8_DDR_PMU is not set
+CONFIG_ARM_DSU_PMU=m
+CONFIG_FSL_IMX8_DDR_PMU=m
 CONFIG_HISI_PMU=y
-# CONFIG_QCOM_L2_PMU is not set
-# CONFIG_QCOM_L3_PMU is not set
-# CONFIG_XGENE_PMU is not set
+CONFIG_QCOM_L2_PMU=y
+CONFIG_QCOM_L3_PMU=y
+CONFIG_THUNDERX2_PMU=m
+CONFIG_XGENE_PMU=y
 CONFIG_ARM_SPE_PMU=m
 # end of Performance monitor support
 
@@ -8806,42 +9480,78 @@ CONFIG_RAS=y
 # CONFIG_ANDROID is not set
 # end of Android
 
-CONFIG_LIBNVDIMM=y
+CONFIG_LIBNVDIMM=m
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
 CONFIG_ND_CLAIM=y
 CONFIG_ND_BTT=m
 CONFIG_BTT=y
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
 CONFIG_NVDIMM_KEYS=y
 CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_KMEM=m
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+CONFIG_NVMEM_IMX_OCOTP_SCU=m
 CONFIG_MTK_EFUSE=m
 CONFIG_QCOM_QFPROM=m
-# CONFIG_ROCKCHIP_EFUSE is not set
-CONFIG_NVMEM_BCM_OCOTP=y
+CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_SUNXI_SID=m
-CONFIG_UNIPHIER_EFUSE=m
-CONFIG_MESON_MX_EFUSE=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
-# CONFIG_SC27XX_EFUSE is not set
-# CONFIG_NVMEM_ZYNQMP is not set
+CONFIG_MESON_EFUSE=m
+# CONFIG_MESON_MX_EFUSE is not set
+CONFIG_NVMEM_SNVS_LPGPR=m
+CONFIG_SC27XX_EFUSE=m
+CONFIG_NVMEM_ZYNQMP=y
 
 #
 # HW tracing support
 #
-# CONFIG_STM is not set
+CONFIG_STM=y
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+# CONFIG_STM_DUMMY is not set
+CONFIG_STM_SOURCE_CONSOLE=y
+# CONFIG_STM_SOURCE_HEARTBEAT is not set
+CONFIG_STM_SOURCE_FTRACE=m
 # CONFIG_INTEL_TH is not set
 # end of HW tracing support
 
-# CONFIG_FPGA is not set
+CONFIG_FPGA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_STRATIX10_SOC=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_OF_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_FPGA_MGR_ZYNQMP_FPGA=m
 # CONFIG_FSI is not set
-# CONFIG_TEE is not set
+CONFIG_TEE=m
+
+#
+# TEE drivers
+#
+# CONFIG_OPTEE is not set
+# end of TEE drivers
+
 CONFIG_MULTIPLEXER=m
 
 #
@@ -8879,7 +9589,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
+# CONFIG_REISERFS_PROC_INFO is not set
 CONFIG_REISERFS_FS_XATTR=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
@@ -8888,7 +9598,7 @@ CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=y
+CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 # CONFIG_XFS_RT is not set
@@ -8900,7 +9610,7 @@ CONFIG_GFS2_FS_LOCKING_DLM=y
 CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_FS_STATS=y
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
@@ -8911,7 +9621,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=y
+CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
@@ -8919,7 +9629,7 @@ CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_IO_TRACE is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_FS_DAX is not set
+CONFIG_FS_DAX=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
@@ -8936,9 +9646,9 @@ CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
 # CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=y
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=y
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
@@ -8977,11 +9687,11 @@ CONFIG_UDF_FS=m
 #
 # DOS/FAT/NT Filesystems
 #
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
 CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
@@ -8992,7 +9702,9 @@ CONFIG_NTFS_FS=m
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_CHILDREN=y
@@ -9006,7 +9718,7 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=y
+CONFIG_EFIVAR_FS=m
 # end of Pseudo filesystems
 
 CONFIG_MISC_FILESYSTEMS=y
@@ -9022,18 +9734,10 @@ CONFIG_BEFS_FS=m
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS2_FS is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
-# CONFIG_UBIFS_ATIME_SUPPORT is not set
-CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_SECURITY=y
-CONFIG_UBIFS_FS_AUTHENTICATION=y
+# CONFIG_UBIFS_FS is not set
 CONFIG_CRAMFS=m
 CONFIG_CRAMFS_BLOCKDEV=y
-# CONFIG_CRAMFS_MTD is not set
+CONFIG_CRAMFS_MTD=y
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FILE_CACHE=y
 # CONFIG_SQUASHFS_FILE_DIRECT is not set
@@ -9050,25 +9754,28 @@ CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
+# CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
+CONFIG_HPFS_FS=m
 # CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
 CONFIG_ROMFS_FS=m
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
 # CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
 CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_ROMFS_ON_MTD=y
 CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
 # CONFIG_PSTORE_LZO_COMPRESS is not set
 # CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+CONFIG_PSTORE_LZ4HC_COMPRESS=m
 # CONFIG_PSTORE_842_COMPRESS is not set
 CONFIG_PSTORE_ZSTD_COMPRESS=y
 CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
 # CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_CONSOLE is not set
@@ -9083,23 +9790,25 @@ CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
 CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_POSIX_ACL=y
-# CONFIG_EROFS_FS_SECURITY is not set
-# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_ZIP=y
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
 CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V2 is not set
-CONFIG_NFS_V3=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=y
-CONFIG_PNFS_BLOCK=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DEBUG=y
@@ -9113,18 +9822,19 @@ CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_SCSILAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
 CONFIG_NFSD_V4_SECURITY_LABEL=y
-CONFIG_GRACE_PERIOD=y
-CONFIG_LOCKD=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
@@ -9140,6 +9850,7 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
 CONFIG_CIFS_FSCACHE=y
 CONFIG_CODA_FS=m
 # CONFIG_AFS_FS is not set
@@ -9149,7 +9860,7 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
@@ -9172,7 +9883,7 @@ CONFIG_NLS_CODEPAGE_874=m
 CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=y
+CONFIG_NLS_ASCII=m
 CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
@@ -9219,21 +9930,16 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
 # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY_APPARMOR=y
@@ -9244,10 +9950,13 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
 CONFIG_SECURITY_YAMA=y
 # CONFIG_SECURITY_SAFESETID is not set
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_INTEGRITY is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
 
 #
@@ -9258,10 +9967,6 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
-# CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
@@ -9274,6 +9979,8 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
@@ -9298,16 +10005,15 @@ CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
-# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
-# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_ENGINE=m
 
 #
@@ -9325,7 +10031,8 @@ CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_AEGIS128 is not set
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128_SIMD=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=m
 
@@ -9333,7 +10040,7 @@ CONFIG_CRYPTO_ECHAINIV=m
 # Block modes
 #
 CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CFB is not set
+CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
@@ -9341,7 +10048,7 @@ CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=y
-# CONFIG_CRYPTO_KEYWRAP is not set
+CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_NHPOLY1305=m
 CONFIG_CRYPTO_ADIANTUM=m
 CONFIG_CRYPTO_ESSIV=m
@@ -9358,8 +10065,8 @@ CONFIG_CRYPTO_VMAC=m
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32=y
-# CONFIG_CRYPTO_XXHASH is not set
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_POLY1305=m
@@ -9411,9 +10118,9 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
 #
 # Compression
 #
-CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=y
@@ -9428,38 +10135,59 @@ CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=y
-CONFIG_CRYPTO_USER_API_HASH=y
-CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_CRYPTO_USER_API_RNG=y
-CONFIG_CRYPTO_USER_API_AEAD=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
-# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
 CONFIG_CRYPTO_DEV_SAHARA=m
-# CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set
-# CONFIG_CRYPTO_DEV_S5P is not set
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
+CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
+CONFIG_CRYPTO_DEV_S5P=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
 CONFIG_CRYPTO_DEV_MXS_DCP=m
-# CONFIG_CAVIUM_CPT is not set
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
+CONFIG_CRYPTO_DEV_CPT=m
+CONFIG_CAVIUM_CPT=m
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
-# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
+CONFIG_CRYPTO_DEV_ROCKCHIP=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CHELSIO_IPSEC_INLINE=y
+CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_BCM_SPU=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
 CONFIG_CRYPTO_DEV_CCREE=m
-# CONFIG_CRYPTO_DEV_HISI_SEC is not set
+CONFIG_CRYPTO_DEV_HISI_SEC=m
 CONFIG_CRYPTO_DEV_HISI_QM=m
 CONFIG_CRYPTO_HISI_SGL=m
 CONFIG_CRYPTO_DEV_HISI_ZIP=m
@@ -9471,7 +10199,7 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 CONFIG_TPM_KEY_PARSER=m
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
 
 #
 # Certificates for signature checking
@@ -9502,11 +10230,11 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_STMP_DEVICE=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-# CONFIG_INDIRECT_PIO is not set
+CONFIG_INDIRECT_PIO=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=y
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 CONFIG_CRC32_SLICEBY8=y
@@ -9514,19 +10242,19 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=y
-CONFIG_LIBCRC32C=y
+CONFIG_CRC4=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
 CONFIG_XXHASH=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
 # CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
+CONFIG_842_COMPRESS=y
+CONFIG_842_DECOMPRESS=y
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
@@ -9535,12 +10263,12 @@ CONFIG_LZ4_DECOMPRESS=y
 CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
-# CONFIG_XZ_DEC_X86 is not set
-# CONFIG_XZ_DEC_POWERPC is not set
-# CONFIG_XZ_DEC_IA64 is not set
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
-# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_SPARC=y
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
@@ -9561,6 +10289,7 @@ CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_BTREE=y
 CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
@@ -9575,6 +10304,7 @@ CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
+CONFIG_DMA_VIRT_OPS=y
 CONFIG_SWIOTLB=y
 CONFIG_DMA_REMAP=y
 CONFIG_DMA_DIRECT_REMAP=y
@@ -9583,7 +10313,7 @@ CONFIG_DMA_CMA=y
 #
 # Default contiguous memory area size:
 #
-CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_MBYTES=0
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMA_SIZE_SEL_MIN is not set
@@ -9608,13 +10338,27 @@ CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+CONFIG_SG_SPLIT=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
 # CONFIG_STRING_SELFTEST is not set
 # end of Library routines
 
@@ -9630,7 +10374,7 @@ CONFIG_PRINTK_TIME=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
 # end of printk and dmesg options
 
@@ -9644,7 +10388,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
+CONFIG_FRAME_WARN=2048
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_DEBUG_FS=y
@@ -9654,11 +10398,11 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 # end of Compile-time checks and compiler options
 
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_MISC=y
@@ -9666,9 +10410,9 @@ CONFIG_DEBUG_MISC=y
 #
 # Memory Debugging
 #
-# CONFIG_PAGE_EXTENSION is not set
+CONFIG_PAGE_EXTENSION=y
 # CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
 CONFIG_PAGE_POISONING_NO_SANITY=y
 CONFIG_PAGE_POISONING_ZERO=y
@@ -9683,7 +10427,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_VM is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
@@ -9695,12 +10439,15 @@ CONFIG_KASAN_STACK=1
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
-CONFIG_DEBUG_SHIRQ=y
+# CONFIG_DEBUG_SHIRQ is not set
 
 #
 # Debug Lockups and Hangs
 #
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
@@ -9740,20 +10487,20 @@ CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_DEBUG_CREDENTIALS=y
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
 
 #
 # RCU Debugging
 #
 CONFIG_TORTURE_TEST=m
-# CONFIG_RCU_PERF_TEST is not set
+CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_TORTURE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_TRACE=y
 # CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
 
@@ -9763,7 +10510,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 CONFIG_FUNCTION_ERROR_INJECTION=y
 # CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
+CONFIG_LATENCYTOP=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -9776,6 +10523,7 @@ CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
@@ -9788,7 +10536,7 @@ CONFIG_SCHED_TRACER=y
 # CONFIG_HWLAT_TRACER is not set
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 CONFIG_STACK_TRACER=y
@@ -9803,11 +10551,12 @@ CONFIG_FUNCTION_PROFILER=y
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
 CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_HIST_TRIGGERS is not set
+CONFIG_TRACING_MAP=y
+CONFIG_HIST_TRIGGERS=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
-CONFIG_PREEMPTIRQ_DELAY_TEST=m
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
@@ -9819,12 +10568,12 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
-CONFIG_ATOMIC64_SELFTEST=y
+# CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_STRSCPY is not set
-CONFIG_TEST_KSTRTOX=y
+# CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BITFIELD is not set
@@ -9834,6 +10583,7 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_IDA is not set
+# CONFIG_TEST_PARMAN is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
@@ -9846,17 +10596,20 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
-CONFIG_BUG_ON_DATA_CORRUPTION=y
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_KGDB=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
-CONFIG_KGDB_TESTS=y
-# CONFIG_KGDB_TESTS_ON_BOOT is not set
-# CONFIG_KGDB_KDB is not set
+# CONFIG_KGDB_TESTS is not set
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
+CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
 CONFIG_UBSAN_ALIGNMENT=y
@@ -9865,11 +10618,19 @@ CONFIG_STRICT_DEVMEM=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_ARM64_PTDUMP_CORE=y
 # CONFIG_ARM64_PTDUMP_DEBUGFS is not set
-# CONFIG_PID_IN_CONTEXTIDR is not set
+CONFIG_PID_IN_CONTEXTIDR=y
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
 CONFIG_DEBUG_WX=y
 # CONFIG_DEBUG_ALIGN_RODATA is not set
 # CONFIG_DEBUG_EFI is not set
-# CONFIG_ARM64_RELOC_TEST is not set
-# CONFIG_CORESIGHT is not set
+CONFIG_ARM64_RELOC_TEST=m
+CONFIG_CORESIGHT=y
+CONFIG_CORESIGHT_LINKS_AND_SINKS=y
+CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
+CONFIG_CORESIGHT_CATU=y
+CONFIG_CORESIGHT_SINK_TPIU=y
+CONFIG_CORESIGHT_SINK_ETBV10=y
+CONFIG_CORESIGHT_SOURCE_ETM4X=y
+CONFIG_CORESIGHT_STM=y
+CONFIG_CORESIGHT_CPU_DEBUG=m
 # end of Kernel hacking

From 8afeba996f2e9b4019af3ab166ce47802018df52 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Aug 2020 16:44:08 -0500
Subject: [PATCH 267/298] libdwarf: update to 20200719.

---
 srcpkgs/libdwarf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdwarf/template b/srcpkgs/libdwarf/template
index 76d5e87d172..5d5539c3ae3 100644
--- a/srcpkgs/libdwarf/template
+++ b/srcpkgs/libdwarf/template
@@ -1,6 +1,6 @@
 # Template file for 'libdwarf'
 pkgname=libdwarf
-version=20200114
+version=20200719
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --enable-dwarfgen"
@@ -10,7 +10,7 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="LGPL-2.1-only"
 homepage="https://www.prevanders.net/dwarf.html"
 distfiles="https://prevanders.net/${pkgname}-${version}.tar.gz"
-checksum=cffd8d600ca3181a5194324c38d50f94deb197249b2dea92d18969a7eadd2c34
+checksum=307d02b8f972de82c4b690a6e9852b66b6df0a23aa8d407430b6ee3d9ecbaccd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="elfutils-devel"

From 4028014c02e845e8cd46f223cf0e8b654efc2f9f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Aug 2020 16:42:10 -0500
Subject: [PATCH 268/298] SweetHome3D: update to 6.4.

---
 srcpkgs/SweetHome3D/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SweetHome3D/template b/srcpkgs/SweetHome3D/template
index 2bf30efb84c..21e9bcceb63 100644
--- a/srcpkgs/SweetHome3D/template
+++ b/srcpkgs/SweetHome3D/template
@@ -1,6 +1,6 @@
 # Template file for 'SweetHome3D'
 pkgname=SweetHome3D
-version=6.3
+version=6.4
 revision=1
 archs="i686 x86_64"
 wrksrc="SweetHome3D-${version}-src"
@@ -12,7 +12,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="www.sweethome3d.com"
 distfiles="${SOURCEFORGE_SITE}/sweethome3d/SweetHome3D-${version}-src.zip"
-checksum=b741adc7ae8f893a971e5251b1bc07e61efcecd42ba56039182649815145d640
+checksum=e212a0b78cfc41861d6b3978f63c7f97b760bee483a51de544802f1606aee86e
 
 do_build() {
 	ant application textures furniture examples help java3dLibraries

From 25cfd660fdf8b5e04d9b7d475493204cf5a16139 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Jun 2020 21:18:04 -0500
Subject: [PATCH 269/298] xmoto: update to 0.6.1.

---
 srcpkgs/xmoto/patches/fix-gcc7.patch          | 47 -------------------
 srcpkgs/xmoto/patches/fix-include.patch       | 25 ----------
 .../patches/modernize-configure_ac.patch      | 16 -------
 srcpkgs/xmoto/patches/musl-stdint_h.patch     | 10 ----
 srcpkgs/xmoto/template                        | 35 +++++---------
 5 files changed, 11 insertions(+), 122 deletions(-)
 delete mode 100644 srcpkgs/xmoto/patches/fix-gcc7.patch
 delete mode 100644 srcpkgs/xmoto/patches/fix-include.patch
 delete mode 100644 srcpkgs/xmoto/patches/modernize-configure_ac.patch
 delete mode 100644 srcpkgs/xmoto/patches/musl-stdint_h.patch

diff --git a/srcpkgs/xmoto/patches/fix-gcc7.patch b/srcpkgs/xmoto/patches/fix-gcc7.patch
deleted file mode 100644
index bf8b1cba1f3..00000000000
--- a/srcpkgs/xmoto/patches/fix-gcc7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./src/WWW.cpp.orig	2018-01-16 10:53:58.725405426 +0100
-+++ ./src/WWW.cpp	2018-01-16 10:55:14.802101942 +0100
-@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri
-   std::string v_www_agent = WWW_AGENT;
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " 
-         + v_local_file_tmp);
-   }
-@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri
-   LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR"));
-   }
-       
-@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string&
-   LogInfo("Sending vote");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV"));
-   }
-       
-@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string
-   LogInfo("Sending report");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR"));
-   }
-       
-@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri
-   LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(p_answerFile.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " + p_answerFile);
-   }
-       
diff --git a/srcpkgs/xmoto/patches/fix-include.patch b/srcpkgs/xmoto/patches/fix-include.patch
deleted file mode 100644
index 4bc2179e376..00000000000
--- a/srcpkgs/xmoto/patches/fix-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/net/NetActions.cpp.orig	2018-01-16 11:03:55.152026167 +0100
-+++ src/net/NetActions.cpp	2018-01-16 11:03:59.910007186 +0100
-@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite
- #include <sstream>
- #include "../helpers/SwapEndian.h"
- #include "helpers/Net.h"
--#include "helpers/utf8.h"
-+#include "../helpers/utf8.h"
- 
- char NetAction::m_buffer[NETACTION_MAX_PACKET_SIZE];
- unsigned int NetAction::m_biggestTCPPacketSent = 0;
---- src/helpers/utf8.h.orig	2018-01-16 11:08:10.042009362 +0100
-+++ src/helpers/utf8.h	2018-01-16 11:08:17.306980381 +0100
-@@ -18,8 +18,8 @@ along with XMOTO; if not, write to the F
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- =============================================================================*/
- 
--#ifndef __UTF8_H__
--#define __UTF8_H__
-+#ifndef __MYUTF8_H__
-+#define __MYUTF8_H__
- 
- #include <vector>
- #include <string>
-
diff --git a/srcpkgs/xmoto/patches/modernize-configure_ac.patch b/srcpkgs/xmoto/patches/modernize-configure_ac.patch
deleted file mode 100644
index be88ff4c6b5..00000000000
--- a/srcpkgs/xmoto/patches/modernize-configure_ac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.in	2014-03-29 11:35:24.000000000 +0100
-+++ configure.in	2015-11-03 13:02:49.686607352 +0100
-@@ -1,8 +1,8 @@
--AC_INIT(src/GameInit.cpp)
--
--AC_CANONICAL_TARGET()
--AM_INIT_AUTOMAKE(xmoto,0.5.11)
--AC_GNU_SOURCE
-+AC_PREREQ([2.69])
-+AC_INIT([xmoto],[0.5.11])
-+AC_CONFIG_SRCDIR(src/GameInit.cpp)
-+AM_INIT_AUTOMAKE([1.15 foreign gnu subdir-objects])
-+LT_INIT
- 
- AC_PROG_CXX
- AC_PROG_CPP
diff --git a/srcpkgs/xmoto/patches/musl-stdint_h.patch b/srcpkgs/xmoto/patches/musl-stdint_h.patch
deleted file mode 100644
index 03684b56923..00000000000
--- a/srcpkgs/xmoto/patches/musl-stdint_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DBuffer.cpp	2011-10-11 22:18:35.000000000 +0200
-+++ src/DBuffer.cpp	2015-10-01 22:28:36.654255001 +0200
-@@ -23,6 +23,7 @@
-  */
- #include "DBuffer.h"
- #include "helpers/SwapEndian.h"
-+#include <stdint.h>
- #include <algorithm>
- 
-   void DBuffer::_FreeDBuffer(void) {
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index 70803d714f2..ae400bdce0a 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,38 +1,25 @@
 # Template file for 'xmoto'
 pkgname=xmoto
-version=0.5.11
-revision=11
-build_style=gnu-configure
-configure_args="--disable-sdltest CPPFLAGS=-DdDOUBLE"
+version=0.6.1
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
 hostmakedepends="automake libtool gettext-devel intltool desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
  libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
- SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel bzip2-devel"
+ SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel bzip2-devel
+ gettext-libs"
 depends="${pkgname}-data"
 short_desc="2D motocross platform game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xmoto.tuxfamily.org/"
-distfiles="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"
-checksum=a584a6f9292b184686b72c78f16de4b82d5c5b72ad89e41912ff50d03eca26b2
+distfiles="https://github.com/xmoto/xmoto/archive/${version}/${version}.tar.gz"
+checksum=209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66
 
-# Build using the old C++ ABI to fix issue with missing text; the issue
-# should be fixed in the next stable release (if that ever does happen)
-CPPFLAGS+=" -D_GLIBCXX_USE_CXX11_ABI=0"
-
-if [ "$CROSS_BUILD" ]; then
-	# configure can't test this when cross compiling
-	export ac_cv_lib_GLU_gluBuild2DMipmaps=yes
-	LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib"
-	hostmakedepends+=" SDL_mixer-devel libxml2-devel"
-fi
-
-pre_configure() {
-	# remove old ode version
-	rm -r src/ode
-	mv configure.{in,ac}
-	libtoolize
-	./bootstrap
+pre_install() {
+	vtargetrun build/src/xmoto --pack build/bin/xmoto.bin bin/
 }
 
 post_install() {

From c98f726da27c226d291076d77f26806bafb09f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 3 Aug 2020 07:48:51 +0700
Subject: [PATCH 270/298] cpio: remove bash from checkdepends

- bash is provided by chroot-bash inside chroot
- upon installing checkdepends, bash will replace chroot-bash,
  upon cleanup after checking, uninstall bash will render chroot
  broken, see #23929
---
 srcpkgs/cpio/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/cpio/template b/srcpkgs/cpio/template
index 1dc44f9f35a..2c91ad1cb1a 100644
--- a/srcpkgs/cpio/template
+++ b/srcpkgs/cpio/template
@@ -5,7 +5,6 @@ revision=1
 build_style=gnu-configure
 configure_args="--with-rmt=/usr/bin/rmt"
 hostmakedepends="automake gettext-devel tar"
-checkdepends="bash"
 short_desc="GNU copy-in/out (cpio) with remote magnetic tape (rmt) support"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"

From 24bf44d56bac3614e966c6fbf91d25a3d9449160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 3 Aug 2020 07:48:51 +0700
Subject: [PATCH 271/298] shunit2: remove bash from checkdepends

- bash is provided by chroot-bash inside chroot
- upon installing checkdepends, bash will replace chroot-bash,
  upon cleanup after checking, uninstall bash will render chroot
  broken, see #23929
- check is failing on testIssue84 with both bash and chroot-bash,
  I didn't bother to check why.
---
 srcpkgs/shunit2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shunit2/template b/srcpkgs/shunit2/template
index 4e9c1c30dac..f909503b0f6 100644
--- a/srcpkgs/shunit2/template
+++ b/srcpkgs/shunit2/template
@@ -4,7 +4,7 @@ version=2.1.8
 revision=1
 archs=noarch
 depends="bash"
-checkdepends="bash zsh ksh"
+checkdepends="zsh ksh"
 short_desc="Unit testing framework for Unix shell scripts based on xUnit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From a2fb1470fb95d3b6a4c4ebfa6ac43530e813d74e Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Aug 2020 10:53:39 +0200
Subject: [PATCH 272/298] ddcutil: update to 0.9.9.

---
 common/shlibs                      |  2 +-
 srcpkgs/ddcutil/patches/musl.patch | 10 ----------
 srcpkgs/ddcutil/template           |  4 ++--
 3 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/ddcutil/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index cc6c17a61a0..dcb1d8e54b6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3172,7 +3172,7 @@ libgfshare.so.2 libgfshare-2.0.0_1
 libtracker-miner-2.0.so.0 libtracker-2.0.1_1
 libtacacs.so.1 tacacs-4.0.4.28_1
 libffms2.so.4 libffms2-2.23.1_1
-libddcutil.so.2 ddcutil-0.9.8_1
+libddcutil.so.3 ddcutil-0.9.9_1
 liblsmash.so.2 liblsmash-2.9.1_1
 libgiac.so.0 libgiac-1.4.9r17_1
 libgnustep-base.so.1.27 gnustep-base-1.27.0_1
diff --git a/srcpkgs/ddcutil/patches/musl.patch b/srcpkgs/ddcutil/patches/musl.patch
deleted file mode 100644
index 2e21b9eb370..00000000000
--- a/srcpkgs/ddcutil/patches/musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/util/edid.h.orig	2017-11-16 07:13:16.000000000 +0100
-+++ src/util/edid.h	2017-11-17 21:29:05.725854175 +0100
-@@ -36,6 +36,7 @@
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/types.h>
- /** \endcond */
- 
- #include "coredefs.h"
diff --git a/srcpkgs/ddcutil/template b/srcpkgs/ddcutil/template
index 06f85755bb4..ef35fdc987f 100644
--- a/srcpkgs/ddcutil/template
+++ b/srcpkgs/ddcutil/template
@@ -1,6 +1,6 @@
 # Template file for 'ddcutil'
 pkgname=ddcutil
-version=0.9.8
+version=0.9.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.ddcutil.com"
 distfiles="https://github.com/rockowitz/ddcutil/archive/v${version}.tar.gz"
-checksum=445478a226d3fc46c6c058e503bba416948dad1152736b3c91326e60bbfc9025
+checksum=fcb4125be4f6f95c69160bcd8bf6b39b5ae0e2f18f0f7742398cd43e082b82cd
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libexecinfo-devel musl-legacy-compat"

From 8b2a502b2013f5826736bb9ffa3786ed0153de77 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Aug 2020 10:54:37 +0200
Subject: [PATCH 273/298] Clightd: ddcutil sobump

---
 srcpkgs/Clightd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index 0b552ff1137..0b913e51414 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,7 +1,7 @@
 # Template file for 'Clightd'
 pkgname=Clightd
 version=4.1
-revision=1
+revision=2
 build_style=cmake
 cmake_builddir=build
 configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1"

From a71a90fcf93bebe4c59f92a2e56eee498dadebec Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Aug 2020 11:01:11 +0200
Subject: [PATCH 274/298] girara: update to 0.3.5.

---
 srcpkgs/girara/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template
index 77ab9cf418d..7a39f61af29 100644
--- a/srcpkgs/girara/template
+++ b/srcpkgs/girara/template
@@ -1,7 +1,7 @@
 # Template file for 'girara'
 pkgname=girara
-version=0.3.4
-revision=2
+version=0.3.5
+revision=1
 build_style=meson
 configure_args="$(vopt_if notify -Dnotify=enabled -Dnotify=disabled) -Dtests=disabled"
 hostmakedepends="pkg-config intltool doxygen glib-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/girara/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=51fcda5a50a68fabd461fb4e467a1defd531dafca4f47f6851a9eb56756cb232
+checksum=e33ba2a21dd57606439d37c829d48466a14e3e50a698e6bd678b511f5c59f4b5
 
 build_options="notify"
 build_options_default="notify"

From 12b176613c1047c21333af8de9806512666ca2dd Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Aug 2020 11:06:11 +0200
Subject: [PATCH 275/298] zathura: update to 0.4.6.

---
 .../patches/fish-completion-vendor.patch      | 77 -------------------
 srcpkgs/zathura/template                      |  6 +-
 2 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/zathura/patches/fish-completion-vendor.patch

diff --git a/srcpkgs/zathura/patches/fish-completion-vendor.patch b/srcpkgs/zathura/patches/fish-completion-vendor.patch
deleted file mode 100644
index 780d53024c2..00000000000
--- a/srcpkgs/zathura/patches/fish-completion-vendor.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-# upstream: yes
-
-From bf46e4de707f364082570f4818846f2944b0ccfa Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 21 Jan 2020 21:39:00 -0500
-Subject: [PATCH] Fix installation of bash/fish completions using pkg-config
-
-Both shells provide pkg-config files which declare their designated
-completionsdir. Use this as the primary source of truth.
----
- data/meson.build | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c1e9231..557b630 100644
---- data/meson.build
-+++ data/meson.build
-@@ -70,6 +70,20 @@ fish_completion = configure_file(
-   configuration: conf_data
- )
- 
--install_data(bash_completion, install_dir: join_paths(datadir, 'bash-completion', 'completions'))
-+bash_comp = dependency('bash-completion', required: false)
-+if bash_comp.found()
-+  bash_compdir = bash_comp.get_pkgconfig_variable('completionsdir')
-+else
-+  bash_compdir = join_paths(datadir, 'bash-completion', 'completions')
-+endif
-+
-+fish_comp = dependency('fish', required: false)
-+if fish_comp.found()
-+  fish_compdir = fish_comp.get_pkgconfig_variable('completionsdir')
-+else
-+  fish_compdir = join_paths(datadir, 'fish', 'completions')
-+endif
-+
-+install_data(bash_completion, install_dir: bash_compdir)
- install_data(zsh_completion, install_dir: join_paths(datadir, 'zsh', 'site-functions'))
--install_data(fish_completion, install_dir: join_paths(datadir, 'fish', 'completions'))
-+install_data(fish_completion, install_dir: fish_compdir)
--- 
-2.25.0
-
-
-
-
-From d21d0406630eaf5e20d180524e6d396611e7243a Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 21 Jan 2020 21:39:26 -0500
-Subject: [PATCH] fish-completion: use the correct fallback directory
-
-fish completions should never be installed to share/fish/completions/ as
-that directory is reserved exclusively for completions shipped as part
-of the fish source code.
-
-Use the same vendor_completions.d/ directory which the default fish
-configuration uses.
----
- data/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 557b630..4649160 100644
---- data/meson.build
-+++ data/meson.build
-@@ -81,7 +81,7 @@ fish_comp = dependency('fish', required: false)
- if fish_comp.found()
-   fish_compdir = fish_comp.get_pkgconfig_variable('completionsdir')
- else
--  fish_compdir = join_paths(datadir, 'fish', 'completions')
-+  fish_compdir = join_paths(datadir, 'fish', 'vendor_completions.d')
- endif
- 
- install_data(bash_completion, install_dir: bash_compdir)
--- 
-2.25.0
-
diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index bc28d8c830f..356cdc6efb7 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura'
 pkgname=zathura
-version=0.4.5
-revision=2
+version=0.4.6
+revision=1
 build_style=meson
 configure_args="-Dsynctex=disabled -Dtests=disabled"
 hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils
@@ -13,7 +13,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/zathura/"
 distfiles="https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"
-checksum=0c3997aafbcdaaae60a4522f208adadfdd2758b432ce94ea16fbcee937cb762c
+checksum=f9b2b3c3d2b4b612206b93e49df21c01ee184dc0a4eca956383d000a98836f0c
 
 post_install() {
 	vlicense LICENSE

From efed6ade8870f2d66280abff33873f5d68337995 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Aug 2020 11:58:13 +0200
Subject: [PATCH 276/298] kakoune: update to 2020.08.04.

---
 srcpkgs/kakoune/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index 6e8b5eb0216..58aea3b2fed 100644
--- a/srcpkgs/kakoune/template
+++ b/srcpkgs/kakoune/template
@@ -1,7 +1,7 @@
 # Template file for 'kakoune'
 pkgname=kakoune
 reverts=20180409_1
-version=2020.01.16
+version=2020.08.04
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -14,4 +14,4 @@ maintainer="Jakub Skrzypnik <j.skrzypnik@openmailbox.org>"
 license="Unlicense"
 homepage="https://kakoune.org"
 distfiles="https://github.com/mawww/kakoune/releases/download/v${version}/kakoune-${version}.tar.bz2"
-checksum=a094f1689f0228308f631e371b382b0c0522391fc8b6c23a6cbc71ff404a0dae
+checksum=02469fac1ff83191165536fa52f01907db5be0a734bc90570924b3edbb9cf121

From ab12838f47159bb9db0e4558920ff32eb6cd5700 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Aug 2020 12:07:41 +0200
Subject: [PATCH 277/298] golly: update to 3.4.

---
 srcpkgs/golly/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template
index 44a3069e2eb..abcc87642c4 100644
--- a/srcpkgs/golly/template
+++ b/srcpkgs/golly/template
@@ -1,6 +1,6 @@
 # Template file for 'golly'
 pkgname=golly
-version=3.3
+version=3.4
 revision=1
 wrksrc="${pkgname}-${version}-src"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://golly.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.gz"
-checksum=88fd776b1afd763ef32ac6e6d95ddfcbc51b74f6ef6a1f3ba9aa659295d573c8
+checksum=198dd681e10b1ad5d40c218521206e326fc0c142a14027e18c5b73dde27655dd
 
 post_extract() {
 	# POSIX name clash

From 114cc11bad9670b5a7766b78827eb3bb3eae0be9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Aug 2020 12:08:17 +0200
Subject: [PATCH 278/298] fzf: update to 0.22.0.

---
 srcpkgs/fzf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 7945d569eb1..109f5d44028 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.21.1
+version=0.22.0
 revision=1
 build_style=go
 go_import_path=github.com/junegunn/fzf
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/junegunn/fzf"
 changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
 distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz"
-checksum=47adf138f17c45d390af81958bdff6f92157d41e2c4cb13773df078b905cdaf4
+checksum=3090748bb656333ed98490fe62133760e5da40ba4cd429a8142b4a0b69d05586
 
 post_install() {
 	cd ${wrksrc}

From dd1271c07e844bf144474d5332ff893e18de988e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Aug 2020 12:09:03 +0200
Subject: [PATCH 279/298] miller: update to 5.8.0.

---
 srcpkgs/miller/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index 48cc6886bbb..a294d97f34c 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,6 +1,6 @@
 # Template file for 'miller'
 pkgname=miller
-version=5.7.0
+version=5.8.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool flex asciidoc"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
 homepage="http://johnkerl.org/miller/"
 changelog="https://github.com/johnkerl/miller/releases"
 distfiles="https://github.com/johnkerl/${pkgname}/archive/v${version}.tar.gz"
-checksum=5ef4a2c58fa8f6d12ba64d26cecf904af1dc476cc6db9b92d3e2aff2e937f4bf
+checksum=83fcb8218145654583f5c384d3c8e055f478f1da919d51e9be3c489a006492c2
 
 pre_configure() {
 	# Disable debugging and profiling versions, broken on musl.

From f7115080435892dcc66db38506c7ea9f079d8677 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Aug 2020 14:15:02 +0200
Subject: [PATCH 280/298] ghc-bin: orphan.

---
 srcpkgs/ghc-bin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index f3820a0ac37..34f3c81ffb3 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -7,7 +7,7 @@ wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="ncurses perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes

From dcde2c957eb6d6e86f6ff0513bca781e6a98d606 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Aug 2020 14:15:08 +0200
Subject: [PATCH 281/298] grpc: orphan.

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 9a58e311aaa..e78bcedf708 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -11,7 +11,7 @@ hostmakedepends="which protobuf"
 makedepends="zlib-devel c-ares-devel libressl-devel libprotoc-devel
  protobuf-devel gperftools-devel"
 short_desc="High performance, open source, general RPC framework"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}/${pkgname}-${version}.tar.gz

From 098c6fba61db941f9054a841071f9fa06268fd8d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Aug 2020 14:15:16 +0200
Subject: [PATCH 282/298] sndio: orphan.

---
 srcpkgs/sndio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sndio/template b/srcpkgs/sndio/template
index ccded12adc8..ae62ca79304 100644
--- a/srcpkgs/sndio/template
+++ b/srcpkgs/sndio/template
@@ -6,7 +6,7 @@ build_style=configure
 configure_args="--prefix=/usr"
 makedepends="alsa-lib-devel"
 short_desc="Small audio and MIDI framework part of the OpenBSD project"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 system_accounts="sndiod"
 sndiod_descr="sndio daemon"

From de5343f4162a03d78a4548cd60990816383b6d2f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Aug 2020 14:25:32 +0200
Subject: [PATCH 283/298] afl: update to 2.57b.

Adopted.
---
 srcpkgs/afl/template | 10 +++++-----
 srcpkgs/afl/update   |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/afl/update

diff --git a/srcpkgs/afl/template b/srcpkgs/afl/template
index 96c35aa144a..17944716d61 100644
--- a/srcpkgs/afl/template
+++ b/srcpkgs/afl/template
@@ -1,18 +1,18 @@
 # Template file for 'afl'
 pkgname=afl
-version=2.56b
-revision=2
+version=2.57b
+revision=1
 # x86 only currently
 archs="i686* x86_64*"
 wrksrc="AFL-${version}"
 build_style=gnu-makefile
-hostmakedepends="llvm clang which"
+hostmakedepends="clang llvm which"
 short_desc="American fuzzy lop - a brute-force fuzzer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/AFL/"
 distfiles="https://github.com/google/AFL/archive/v${version}.tar.gz"
-checksum=1d4a372e49af02fbcef0dc3ac436d03adff577afc2b6245c783744609d9cdd22
+checksum=6f05a6515c07abe49f6f292bd13c96004cc1e016bda0c3cc9c2769dd43f163ee
 
 nostrip_files="small_archive.a small_exec.elf"
 
diff --git a/srcpkgs/afl/update b/srcpkgs/afl/update
new file mode 100644
index 00000000000..a7e36afa8b6
--- /dev/null
+++ b/srcpkgs/afl/update
@@ -0,0 +1 @@
+pattern='v\K[\d.]+b'

From fd7b5676817195fbde555cbf1966d405542ca689 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 Aug 2020 14:33:44 +0200
Subject: [PATCH 284/298] fping: update to 4.4.

Adopted.
---
 srcpkgs/fping/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fping/template b/srcpkgs/fping/template
index 7dc9e513dc8..3fdad45bc31 100644
--- a/srcpkgs/fping/template
+++ b/srcpkgs/fping/template
@@ -1,15 +1,15 @@
 # Template file for 'fping'
 pkgname=fping
-version=4.2
+version=4.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv4 --enable-ipv6"
 short_desc="High performance ping"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT-alike"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="BSD-3-Clause"
 homepage="http://fping.org"
 distfiles="${homepage}/dist/${pkgname}-${version}.tar.gz"
-checksum=7d339674b6a95aae1d8ad487ff5056fd95b474c3650938268f6a905c3771b64a
+checksum=9f854b65a52dc7b1749d6743e35d0a6268179d1a724267339fc9a066b2b72d11
 
 post_install() {
 	vlicense COPYING

From f7b992a5115223af58dff952ae3ab9b451a7cfb0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 Aug 2020 16:48:37 -0500
Subject: [PATCH 285/298] elfinfo: update to 1.1.0.

---
 srcpkgs/elfinfo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 203a8c040e5..189d842b001 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,6 +1,6 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
@@ -10,7 +10,7 @@ maintainer="Alexander F. Rødseth <xyproto@archlinux.org>"
 license="MIT"
 homepage="https://elfinfo.roboticoverlords.org/"
 distfiles="https://github.com/xyproto/elfinfo/archive/${version}.tar.gz"
-checksum=265bea0fa98003324e3ed9f76ae65fd0340919f012c6d85c8fdd2654843116af
+checksum=d50ae9facbfa2c9ecc24feaa817a2f1c92949b06649ae7a097729c99bd8474dd
 
 post_install() {
 	vlicense LICENSE

From d3a521bdf312a911fc75354e4513fb9dd7a2bdcc Mon Sep 17 00:00:00 2001
From: LamaRaz <51037101+LamaRaz@users.noreply.github.com>
Date: Mon, 3 Aug 2020 00:52:14 -0400
Subject: [PATCH 286/298] nsjail: update to 3.0

---
 .../nsjail/patches/fix-format-warnings.patch  | 44 -------------------
 srcpkgs/nsjail/template                       | 10 ++---
 2 files changed, 5 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/nsjail/patches/fix-format-warnings.patch

diff --git a/srcpkgs/nsjail/patches/fix-format-warnings.patch b/srcpkgs/nsjail/patches/fix-format-warnings.patch
deleted file mode 100644
index 274d6c6d2f2..00000000000
--- a/srcpkgs/nsjail/patches/fix-format-warnings.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9f064737de83ee0fa39bac5c6671a8251fec437e Mon Sep 17 00:00:00 2001
-From: Robert Swiecki <robert@swiecki.net>
-Date: Thu, 12 Sep 2019 22:21:49 +0200
-Subject: [PATCH] user: better formatting directives for printf'like functions
-
----
- user.cc | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git user.cc user.cc
-index d2342aa..e7050dc 100644
---- user.cc
-+++ user.cc
-@@ -257,22 +257,22 @@ bool initNsFromChild(nsjconf_t* nsjconf) {
- 	groupsString += "]";
- 
- 	if (!setResGid(nsjconf->gids[0].inside_id)) {
--		PLOG_E("setresgid(%u)", nsjconf->gids[0].inside_id);
-+		PLOG_E("setresgid(%lu)", (unsigned long)nsjconf->gids[0].inside_id);
- 		return false;
- 	}
- 
--	LOG_D("setgroups(%lu, %s)", groups.size(), groupsString.c_str());
-+	LOG_D("setgroups(%zu, %s)", groups.size(), groupsString.c_str());
- 	if (setgroups(groups.size(), groups.data()) == -1) {
- 		/* Indicate error if specific groups were requested */
- 		if (groups.size() > 0) {
--			PLOG_E("setgroups(%lu, %s) failed", groups.size(), groupsString.c_str());
-+			PLOG_E("setgroups(%zu, %s) failed", groups.size(), groupsString.c_str());
- 			return false;
- 		}
--		PLOG_D("setgroups(%lu, %s) failed", groups.size(), groupsString.c_str());
-+		PLOG_D("setgroups(%zu, %s) failed", groups.size(), groupsString.c_str());
- 	}
- 
- 	if (!setResUid(nsjconf->uids[0].inside_id)) {
--		PLOG_E("setresuid(%u)", nsjconf->uids[0].inside_id);
-+		PLOG_E("setresuid(%lu)", (unsigned long)nsjconf->uids[0].inside_id);
- 		return false;
- 	}
- 
--- 
-2.24.0
-
diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index 8672653477a..3628c969eb2 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
 # Template file for 'nsjail'
 pkgname=nsjail
-version=2.9
-revision=4
+version=3.0
+revision=1
 build_style=gnu-makefile
 hostmakedepends="bison flex pkg-config protobuf which"
 makedepends="libnl3-devel protobuf-devel"
@@ -10,9 +10,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://nsjail.com"
 distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz
-https://github.com/google/kafel/archive/722b93a630e53ca472a4c69f61cb3dfc44ea5041.tar.gz"
-checksum="f8578a48330d3d089c9234a2b562be08043f8fe77453c322724acdf403d0afc3
- 49d2327c794c90aca50a9933c00d453705534b16e5f42d8c8e19c3d274f5e5f8"
+https://github.com/google/kafel/archive/8e69b8efae415cde3debffbb1e379d9e7a16835a.tar.gz"
+checksum="cfa66d3ed136b2e221752287b95e544915e8a6760aa866f023b604d14a374919
+ 4a6c9a1a70ed99bbed767adc106081b017a3090307ea88cc7e329b82daa1373b"
 
 archs="aarch64* armv5tel* armv6l* armv7l* x86_64*"
 

From 69b0b89066de9f6d2bf6b648574191d3ff4358b7 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 29 Jul 2020 22:58:23 -0500
Subject: [PATCH 287/298] perl-module: add perl to build depends

---
 common/environment/build-style/perl-module.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/environment/build-style/perl-module.sh b/common/environment/build-style/perl-module.sh
index 2444d3d104f..300ed9b5db6 100644
--- a/common/environment/build-style/perl-module.sh
+++ b/common/environment/build-style/perl-module.sh
@@ -1 +1,4 @@
+hostmakedepends+=" perl"
+makedepends+=" perl"
+depends+=" perl"
 lib32disabled=yes

From ab4f4de7af3b54c910861e9a139c405e037c86b5 Mon Sep 17 00:00:00 2001
From: atweiden <atweiden@tutanota.de>
Date: Wed, 29 Jul 2020 10:07:22 +1000
Subject: [PATCH 288/298] xxHash: update to 0.8.0.

---
 srcpkgs/xxHash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xxHash/template b/srcpkgs/xxHash/template
index 6a8563f9c82..67c6720af84 100644
--- a/srcpkgs/xxHash/template
+++ b/srcpkgs/xxHash/template
@@ -1,6 +1,6 @@
 # Template file for 'xxHash'
 pkgname=xxHash
-version=0.7.4
+version=0.8.0
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, GPL-2.0-or-later"
 homepage="https://cyan4973.github.io/xxHash/"
 distfiles="https://github.com/Cyan4973/${pkgname}/archive/v${version}.tar.gz>xxhash-${version}.tar.gz"
-checksum=4d9706c9da4fbdf901598f5e3b71db0eddd4ac962e827a73ebf75d66dfd820fe
+checksum=7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f
 
 post_install() {
 	vlicense LICENSE

From e9f64f1ba7286c1ca2d71ba4e7989d9a11637243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 3 Aug 2020 14:16:19 -0300
Subject: [PATCH 289/298] rpi3-firmware: remove package.

Obsolete.
---
 srcpkgs/rpi3-firmware/files/cmdline.txt |  1 -
 srcpkgs/rpi3-firmware/files/config.txt  |  7 -----
 srcpkgs/rpi3-firmware/template          | 41 -------------------------
 3 files changed, 49 deletions(-)
 delete mode 100755 srcpkgs/rpi3-firmware/files/cmdline.txt
 delete mode 100755 srcpkgs/rpi3-firmware/files/config.txt
 delete mode 100644 srcpkgs/rpi3-firmware/template

diff --git a/srcpkgs/rpi3-firmware/files/cmdline.txt b/srcpkgs/rpi3-firmware/files/cmdline.txt
deleted file mode 100755
index 530b7f20424..00000000000
--- a/srcpkgs/rpi3-firmware/files/cmdline.txt
+++ /dev/null
@@ -1 +0,0 @@
-root=/dev/mmcblk0p2 rw rootwait console=ttyS0,115200 smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 loglevel=4 elevator=noop
diff --git a/srcpkgs/rpi3-firmware/files/config.txt b/srcpkgs/rpi3-firmware/files/config.txt
deleted file mode 100755
index 0c8ee03208e..00000000000
--- a/srcpkgs/rpi3-firmware/files/config.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# 64-bit mode
-arm_control=0x200
-
-enable_uart=1
-
-device_tree=dtbs/bcm2837-rpi-3-b.dtb
-kernel=vmlinux-rpi3
diff --git a/srcpkgs/rpi3-firmware/template b/srcpkgs/rpi3-firmware/template
deleted file mode 100644
index a7076ab3da0..00000000000
--- a/srcpkgs/rpi3-firmware/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'rpi3-firmware'
-_githash="6df93defc76d5b511838d6802a01a05072964582"
-_gitshort="${_githash:0:7}"
-
-pkgname=rpi3-firmware
-version=20170113
-revision=1
-archs="aarch64*"
-wrksrc="firmware-${_githash}"
-short_desc="Firmware files for the Raspberry Pi 3 (git ${_gitshort})"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="3-clause-BSD"
-homepage="https://github.com/raspberrypi/firmware"
-distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
-checksum=45e243ce22d2f34f065328d52629cc9bbf52032a23862c6d4c1f044613fc0c48
-nostrip=yes
-
-conf_files="/boot/cmdline.txt /boot/config.txt"
-
-do_install() {
-	rm -f boot/*.img
-	rm -rf boot/overlays
-	rm -f boot/*.dtb
-	rm -f boot/COPYING.linux
-
-	vmkdir boot
-	cp -R boot/* ${DESTDIR}/boot
-
-	vmkdir usr/share/licenses/${pkgname}
-	mv ${DESTDIR}/boot/LICENCE.broadcom ${DESTDIR}/usr/share/licenses/${pkgname}
-
-	# Install configuration files.
-	vinstall ${FILESDIR}/cmdline.txt 644 boot
-	vinstall ${FILESDIR}/config.txt 644 boot
-
-	# Firmware for rpi3 wifi chip
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/brcmfmac43430-sdio.${f}
-		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-}

From 3faf2468ca08f3b3e377fbf6b36ebd3ae42db986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 3 Aug 2020 14:16:35 -0300
Subject: [PATCH 290/298] rpi3-base: remove package.

Obsolete, RPi3 users should use rpi-base and rpi-kernel.
---
 srcpkgs/rpi3-base/INSTALL       |  9 ---------
 srcpkgs/rpi3-base/files/20-rpi3 |  6 ------
 srcpkgs/rpi3-base/template      | 19 -------------------
 3 files changed, 34 deletions(-)
 delete mode 100644 srcpkgs/rpi3-base/INSTALL
 delete mode 100644 srcpkgs/rpi3-base/files/20-rpi3
 delete mode 100644 srcpkgs/rpi3-base/template

diff --git a/srcpkgs/rpi3-base/INSTALL b/srcpkgs/rpi3-base/INSTALL
deleted file mode 100644
index 805997ab294..00000000000
--- a/srcpkgs/rpi3-base/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "$ACTION" in
-post)
-	mkdir -p etc/runit/runsvdir/default/
-	ln -sf /etc/sv/sshd etc/runit/runsvdir/default/
-	ln -sf /etc/sv/ntpd etc/runit/runsvdir/default/
-	ln -sf /etc/sv/dhcpcd etc/runit/runsvdir/default/
-	ln -sf /etc/sv/agetty-ttyS0 etc/runit/runsvdir/default/
-	;;
-esac
diff --git a/srcpkgs/rpi3-base/files/20-rpi3 b/srcpkgs/rpi3-base/files/20-rpi3
deleted file mode 100644
index aaf322d1c99..00000000000
--- a/srcpkgs/rpi3-base/files/20-rpi3
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-PKGNAME="$1"
-VERSION="$2"
-
-echo "Setting RPi3 kernel to ${VERSION}."
-cp /boot/vmlinux-${VERSION} /boot/vmlinux-rpi3
diff --git a/srcpkgs/rpi3-base/template b/srcpkgs/rpi3-base/template
deleted file mode 100644
index 2364b755da5..00000000000
--- a/srcpkgs/rpi3-base/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'rpi3-base'
-pkgname=rpi3-base
-version=0.1
-revision=3
-homepage="http://www.voidlinux.org"
-short_desc="Void Linux RaspberryPi3 (64 bit) base files"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-
-archs="aarch64*"
-depends="virtual?ntp-daemon rpi3-firmware linux"
-
-do_install() {
-	# Fix permissions for the vchiq device.
-	vmkdir usr/lib/udev/rules.d
-	echo 'SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"' > \
-		${DESTDIR}/usr/lib/udev/rules.d/71-raspberrypi.rules
-	vinstall ${FILESDIR}/20-rpi3 0755 etc/kernel.d/post-install
-}

From 9ce48a2a8a6e2df1f46134c909432cbee5ba0344 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 Aug 2020 08:00:14 -0500
Subject: [PATCH 291/298] sqlmap: update to 1.4.8.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 0787d5ff905..e7a76a818bf 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.4.7
+version=1.4.8
 revision=1
 archs=noarch
 pycompile_dirs="usr/share/sqlmap"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=67c3f2a5cde788be59d7cdb334c3835b32d082f88298530bcfe67525f3103bfc
+checksum=2f8b64881afdbd044dcf3707dc7f56e7347e3332a692dfe79fb59ef71c7bb769
 python_version=3
 
 do_install() {

From 7b672e09064f033538afa230c5323c13fbbbe644 Mon Sep 17 00:00:00 2001
From: "B. Wilson" <x@wilsonb.com>
Date: Thu, 25 Jun 2020 10:06:25 +0900
Subject: [PATCH 292/298] j: update to 901.f.

---
 srcpkgs/j/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/j/template b/srcpkgs/j/template
index f2d4a5463aa..c34d54c96d2 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,10 +1,10 @@
 # Template file for 'j'
 pkgname=j
 _vmaj=901
-_vmin=e
+_vmin=f
 _vrel=${_vmaj}-release${_vmin:+-}${_vmin}
 version=${_vmaj}.${_vmin}
-revision=5
+revision=1
 archs="aarch64* armv[67]* i686* x86_64*"
 wrksrc="jsource-j${_vrel}"
 makedepends="libedit-devel libgomp-devel libomp-devel"
@@ -13,7 +13,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://jsoftware.com/"
 distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=23d1cac75ae8426d4e301b178fac1f29e85d7a0c80cefe4740c104d9c1eeab7a
+checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
 
 _jsz="j${XBPS_TARGET_WORDSIZE}"
 _jtype="release"
@@ -35,8 +35,9 @@ esac
 
 do_configure() {
 	cp jsrc/jversion-x.h jsrc/jversion.h
-	vsed -i "/jplatform/s@unknown@${_jpl}@;
-	         /jtype/s@beta@${_jtype}-${_vmin}@;
+	vsed -i "/jversion/s@${_vmaj}@&-${_vmin}@;
+	         /jplatform/s@unknown@${_jpl}@;
+	         /jtype/s@beta@${_jtype}@;
 	         /jbuilder/s@unknown@${_jbuilder}@" \
 	     jsrc/jversion.h
 

From dcb6f6b238ab45fb0f2fb1ae2fe79a2f2f46902e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 Aug 2020 08:22:21 -0500
Subject: [PATCH 293/298] python3-blessed: update to 1.17.9.

---
 srcpkgs/python3-blessed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-blessed/template b/srcpkgs/python3-blessed/template
index ef5ddd2b9fd..a4a2274bd89 100644
--- a/srcpkgs/python3-blessed/template
+++ b/srcpkgs/python3-blessed/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-blessed'
 pkgname=python3-blessed
-version=1.17.8
+version=1.17.9
 revision=1
 archs=noarch
 wrksrc="blessed-${version}"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/jquast/blessed"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=5275b7e4b2e3acf63b6bf421a793d6785835194b933288fd178e460acadf72e3
+checksum=0ca51c027bff0228eeb9e5269435005768345ce5d32b2163de293a4281f90d35
 
 post_install() {
 	vlicense LICENSE

From db41d4afb0c11f8f6fb808b96fb0a0b9a284e0aa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 30 Apr 2020 16:49:52 +0200
Subject: [PATCH 294/298] runit-kdump: fix conflict with
 /usr/lib/sysctl.d/10-void.conf

---
 srcpkgs/runit-kdump/files/{90-kdump.sh => 07-kdump.sh} | 0
 srcpkgs/runit-kdump/template                           | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename srcpkgs/runit-kdump/files/{90-kdump.sh => 07-kdump.sh} (100%)

diff --git a/srcpkgs/runit-kdump/files/90-kdump.sh b/srcpkgs/runit-kdump/files/07-kdump.sh
similarity index 100%
rename from srcpkgs/runit-kdump/files/90-kdump.sh
rename to srcpkgs/runit-kdump/files/07-kdump.sh
diff --git a/srcpkgs/runit-kdump/template b/srcpkgs/runit-kdump/template
index 04e3fca6c73..0c7f8ea464d 100644
--- a/srcpkgs/runit-kdump/template
+++ b/srcpkgs/runit-kdump/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-kdump'
 pkgname=runit-kdump
 version=20150226
-revision=3
+revision=4
 archs=noarch
 make_dirs="/var/crash 0755 root root"
 depends="runit-void makedumpfile kexec-tools"
@@ -11,5 +11,5 @@ license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
 do_install() {
-	vinstall ${FILESDIR}/90-kdump.sh 0644 etc/runit/core-services
+	vinstall ${FILESDIR}/07-kdump.sh 0644 etc/runit/core-services
 }

From 9fd107368143a28ce0660633d324370f5ecc6080 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Tue, 4 Aug 2020 11:20:30 +0530
Subject: [PATCH 295/298] dbeaver: update to 7.1.4

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 3233a578738..0085e78f52c 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=7.1.2
+version=7.1.4
 revision=1
 archs="x86_64"
 hostmakedepends="apache-maven-bin"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=5f1deb980c621df032dff683f369f1fe10992610eda13abe179fbbd419121436
+checksum=9256089c328c0757a207b0945f6453aa1cbb7e7608bec43be37ee1cf1e0d8502
 nopie=true
 
 do_build() {

From c1c216daea56f69b75140274a30dba75383018fb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 Aug 2020 08:52:55 -0500
Subject: [PATCH 296/298] hivex: update to 1.3.19.

---
 srcpkgs/hivex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 2d06f71ab43..c72b8ee99a4 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.18
-revision=2
+version=1.3.19
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8a1e788fd9ea9b6e8a99705ebd0ff8a65b1bdee28e319c89c4a965430d0a7445
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes

From 401c8f9ba91654e1eac6bee28b0b9603dac09a8b Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Sun, 12 Jul 2020 11:59:15 +0200
Subject: [PATCH 297/298] linux5.7: enable BPF type format on x86_64

Required e.g. for opensnoop from bcc-tools to fix the following problem:
libbpf: failed to find valid kernel BTF
libbpf: vmlinux BTF is not found
bpf: Failed to load program: Invalid argument
---
 srcpkgs/linux5.7/files/x86_64-dotconfig | 2 +-
 srcpkgs/linux5.7/template               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.7/files/x86_64-dotconfig b/srcpkgs/linux5.7/files/x86_64-dotconfig
index 051a8db9923..9a94b7d6a16 100644
--- a/srcpkgs/linux5.7/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.7/files/x86_64-dotconfig
@@ -9563,7 +9563,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
diff --git a/srcpkgs/linux5.7/template b/srcpkgs/linux5.7/template
index 1b23ecb1731..8a5b3ecc118 100644
--- a/srcpkgs/linux5.7/template
+++ b/srcpkgs/linux5.7/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ libressl-devel perl uboot-mkimage cpio pahole"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 2e166d6761b0bde511f0d74418bc80ceb51104a2 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sun, 2 Aug 2020 06:48:57 +0530
Subject: [PATCH 298/298] python-pyperclip: update to 1.8.0.

---
 srcpkgs/python-pyperclip/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-pyperclip/template b/srcpkgs/python-pyperclip/template
index b2eae76e5f1..1286923b906 100644
--- a/srcpkgs/python-pyperclip/template
+++ b/srcpkgs/python-pyperclip/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pyperclip'
 pkgname=python-pyperclip
-version=1.7.0
-revision=3
+version=1.8.0
+revision=1
 archs=noarch
 create_wrksrc=yes
 build_wrksrc=pyperclip-${version}
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pypi.org/project/pyperclip"
 distfiles="${PYPI_SITE}/p/pyperclip/pyperclip-${version}.tar.gz
  https://raw.githubusercontent.com/asweigart/pyperclip/master/LICENSE.txt"
-checksum="979325468ccf682104d5dcaf753f869868100631301d3e72f47babdea5700d1c
+checksum="b75b975160428d84608c26edba2dec146e7799566aea42c1fe1b32e72b6028f2
  a72b0acc9389e4c17ced890ef1b03455e04978d39e25636099b93efb76b74ead"
 
 post_install() {

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] wayvnc and supporting libraries
  2020-07-28  2:27 [PR PATCH] wayvnc and supporting libraries zdykstra
                   ` (6 preceding siblings ...)
  2020-08-04 15:48 ` zdykstra
@ 2020-08-04 15:51 ` zdykstra
  2020-08-04 15:52 ` [PR PATCH] [Closed]: " ahesford
  8 siblings, 0 replies; 10+ messages in thread
From: zdykstra @ 2020-08-04 15:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages wayvnc
https://github.com/void-linux/void-packages/pull/23884

wayvnc and supporting libraries
Tested locally on ppc64le with Remmina - works like a charm.

A patch file from https://github.com/void-linux/void-packages/pull/23884.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wayvnc-23884.patch --]
[-- Type: text/x-diff, Size: 5005 bytes --]

From ca49ce5c40e0b0220712cddab778ed9dfb234408 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:21:11 -0500
Subject: [PATCH 1/3] New package: aml-0.1.0

---
 common/shlibs        |  1 +
 srcpkgs/aml-devel    |  1 +
 srcpkgs/aml/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/aml-devel
 create mode 100644 srcpkgs/aml/template

diff --git a/common/shlibs b/common/shlibs
index b81b17ce2e4..b474efb08c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libaml.so.0 aml-0.1.0_1
diff --git a/srcpkgs/aml-devel b/srcpkgs/aml-devel
new file mode 120000
index 00000000000..511960e2367
--- /dev/null
+++ b/srcpkgs/aml-devel
@@ -0,0 +1 @@
+aml
\ No newline at end of file
diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
new file mode 100644
index 00000000000..4fde3315b80
--- /dev/null
+++ b/srcpkgs/aml/template
@@ -0,0 +1,30 @@
+# Template file for 'aml'
+pkgname=aml
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+short_desc="Another Main Loop"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/aml"
+distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
+checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_install() {
+	vlicense COPYING
+}
+
+aml-devel_package() {
+	depends="aml>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From f170b437108bbac38f827c8ec7b78036966a1ef6 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:22:26 -0500
Subject: [PATCH 2/3] New package: neatvnc-0.2.0

---
 common/shlibs            |  1 +
 srcpkgs/neatvnc-devel    |  1 +
 srcpkgs/neatvnc/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/neatvnc-devel
 create mode 100644 srcpkgs/neatvnc/template

diff --git a/common/shlibs b/common/shlibs
index b474efb08c0..3f25e4a2861 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
+libneatvnc.so.0 neatvnc-0.2.0_1
diff --git a/srcpkgs/neatvnc-devel b/srcpkgs/neatvnc-devel
new file mode 120000
index 00000000000..a0ee2e2a7e9
--- /dev/null
+++ b/srcpkgs/neatvnc-devel
@@ -0,0 +1 @@
+neatvnc
\ No newline at end of file
diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
new file mode 100644
index 00000000000..ac679e14a12
--- /dev/null
+++ b/srcpkgs/neatvnc/template
@@ -0,0 +1,27 @@
+# Template file for 'neatvnc'
+pkgname=neatvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="aml-devel libdrm-devel pixman-devel zlib-devel gnutls-devel libjpeg-turbo-devel"
+short_desc="Liberally licensed VNC server library"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/neatvnc"
+distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
+checksum=b8ab73f6137b9d8407639016de3ad98398f8e002c0eeef30b9fd034f82f9c799
+
+post_install() {
+	vlicense COPYING
+}
+
+neatvnc-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From cff97f98ebe7090a5bd409a253dafd1a08d94faf Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 27 Jul 2020 21:23:25 -0500
Subject: [PATCH 3/3] New package: wayvnc-0.2.0

---
 srcpkgs/wayvnc/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/wayvnc/template

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
new file mode 100644
index 00000000000..4ff4c5d3afb
--- /dev/null
+++ b/srcpkgs/wayvnc/template
@@ -0,0 +1,21 @@
+# Template file for 'wayvnc'
+pkgname=wayvnc
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config ninja wayland-devel"
+makedepends="aml-devel neatvnc-devel libgbm gnutls-devel zlib-devel wayland-devel libjpeg-turbo-devel libdrm-devel pixman-devel libxkbcommon-devel"
+short_desc="VNC server for wlroots based Wayland compositors"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="ISC"
+homepage="https://github.com/any1/wayvnc"
+distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
+checksum=a4ee6f49a821b326e89b2534048687330bc84ed3984499ab2cf39422517fb731
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_install() {
+	vlicense COPYING
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Closed]: wayvnc and supporting libraries
  2020-07-28  2:27 [PR PATCH] wayvnc and supporting libraries zdykstra
                   ` (7 preceding siblings ...)
  2020-08-04 15:51 ` zdykstra
@ 2020-08-04 15:52 ` ahesford
  8 siblings, 0 replies; 10+ messages in thread
From: ahesford @ 2020-08-04 15:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

There's a closed pull request on the void-packages repository

wayvnc and supporting libraries
https://github.com/void-linux/void-packages/pull/23884

Description:
Tested locally on ppc64le with Remmina - works like a charm.

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-08-04 15:52 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-28  2:27 [PR PATCH] wayvnc and supporting libraries zdykstra
2020-07-28  2:36 ` [PR PATCH] [Updated] " zdykstra
2020-07-28  2:56 ` zdykstra
2020-07-28  3:49 ` zdykstra
2020-07-28  4:33 ` zdykstra
2020-07-28 18:40 ` zdykstra
2020-08-04 15:40 ` [PR PATCH] [Updated] " zdykstra
2020-08-04 15:48 ` zdykstra
2020-08-04 15:51 ` zdykstra
2020-08-04 15:52 ` [PR PATCH] [Closed]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).