Sync with Arch

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 8 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3c6d729e80f..910d049d981a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-next-git
 	pkgdesc = Linux NEXT
-	pkgver = 20220328.r0.g8515d05bf6bc
+	pkgver = 20220331.r0.gfdcbcd1348f4
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = x86_64
@@ -20,14 +20,14 @@ pkgbase = linux-next-git
 	source = config
 	sha512sums = SKIP
 	sha512sums = 78a42a306c3b9a4afc6b182150c9ba907e727eceae870e811970aff3a4ce54622c0c86c509d9eddd74c909899bc13897c0c8cfb02395dbaa13e175766d5d77a5
-	sha512sums = 5d1115f19d98d69ea1de533ebef77974e9839892ea01b9979267f8e6a1e0fa8a0896c42a6a65b97f15ddd7dc6841ac530645aca8c708bad5e2f9106aa806fb0a
+	sha512sums = d5599da7e4cf9185c121e399d9d6adfb2c360b5adb7557165f5b84df4dbcfdf9eeb6f118c374326130f1f18742465edc9c19a276933c5deb691ffac59f602f4f
 
 pkgname = linux-next-git
 	pkgdesc = The Linux NEXT kernel and modules
 	depends = coreutils
 	depends = kmod
 	depends = initramfs
-	optdepends = crda: to set the correct wireless channels of your country
+	optdepends = wireless-regdb: to set the correct wireless channels of your country
 	optdepends = linux-firmware: firmware images needed for some devices
 	optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
 	provides = VIRTUALBOX-GUEST-MODULES
diff --git a/PKGBUILD b/PKGBUILD
index 5640b45c4852..2f2e52f3cd48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,7 +47,7 @@ _1k_HZ_ticks=
 ### Do not edit below this line unless you know what you're doing
 
 pkgbase=linux-next-git
-pkgver=20220328.r0.g8515d05bf6bc
+pkgver=20220331.r0.gfdcbcd1348f4
 _srcname=linux-next
 pkgrel=1
 pkgdesc='Linux NEXT'
@@ -173,7 +173,7 @@ build() {
 _package() {
     pkgdesc="The $pkgdesc kernel and modules"
     depends=('coreutils' 'kmod' 'initramfs')
-    optdepends=('crda: to set the correct wireless channels of your country'
+    optdepends=('wireless-regdb: to set the correct wireless channels of your country'
                 'linux-firmware: firmware images needed for some devices'
                 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig')
     provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
@@ -309,4 +309,4 @@ done
 
 sha512sums=('SKIP'
             '78a42a306c3b9a4afc6b182150c9ba907e727eceae870e811970aff3a4ce54622c0c86c509d9eddd74c909899bc13897c0c8cfb02395dbaa13e175766d5d77a5'
-            '5d1115f19d98d69ea1de533ebef77974e9839892ea01b9979267f8e6a1e0fa8a0896c42a6a65b97f15ddd7dc6841ac530645aca8c708bad5e2f9106aa806fb0a')
+            'd5599da7e4cf9185c121e399d9d6adfb2c360b5adb7557165f5b84df4dbcfdf9eeb6f118c374326130f1f18742465edc9c19a276933c5deb691ffac59f602f4f')
diff --git a/config b/config
index 1c80a10f3d2b..f84d5d9a8d94 100644
--- a/config
+++ b/config
@@ -2526,8 +2526,8 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
 #
 # NVME Support
 #
-CONFIG_NVME_CORE=y
-CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_HWMON=y
 CONFIG_NVME_FABRICS=m