Sync with Arch

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

3 files changed, 26 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb7068e6de87..68634195dcc8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-uksm
 	pkgdesc = Linux UKSM
 	pkgver = 5.10.12
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/dolohow/uksm
 	arch = x86_64
 	license = GPL2
@@ -35,7 +35,7 @@ pkgbase = linux-uksm
 	sha512sums = fe301a3a61e66017c197e923b7cc7b6cf127c524bdc830c6d8b173f1121a1aff929ca34d6410e7edd0c0a16f6f2784c9c32d27ddbf550040c728347fe8ae5874
 	sha512sums = 690ef06ac939c0e3077405f9ffe276985075c582a69b8264dc65c065118dd85571feb21b6fe775d60d54be9177ed8df123ed9a2de2f10b61d7b0e7b39190557c
 	sha512sums = 2b5139637624f0b051dd0a19845fca3ffc9bc87ea0f6113459ab3f39a5970d1fc6ee58d2632696013bef9e802df131b2ccc4107c9b4cc7afda3acd02b8576b22
-	sha512sums = 37f001e090f4e48fee05bddeaf54be47cabc75569b52f08429f0322c1c9cfccf7a3d146a687e92828efc469986c114d6433c10b1ce71974c0f416ab3686c1bef
+	sha512sums = ff0153e6162c9a12538886c97d706a9b85918929b4233baa1b88385938c23c095b6e3e6605918b524a805ef6def03ca024d2fbcdde677894101318ae759f5781
 
 pkgname = linux-uksm
 	pkgdesc = The Linux UKSM kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 3e00483afe14..ab9d52831245 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -51,7 +51,7 @@ _major=5.10
 _minor=12
 pkgver=${_major}.${_minor}
 _srcname=linux-${pkgver}
-pkgrel=2
+pkgrel=3
 pkgdesc='Linux UKSM'
 arch=('x86_64')
 url="https://github.com/dolohow/uksm"
@@ -317,7 +317,7 @@ sha512sums=('01062437c9af1654346b5baf550dbefe3cedab18b3d793ee528d1fc27556d5ecc43
             'fe301a3a61e66017c197e923b7cc7b6cf127c524bdc830c6d8b173f1121a1aff929ca34d6410e7edd0c0a16f6f2784c9c32d27ddbf550040c728347fe8ae5874'
             '690ef06ac939c0e3077405f9ffe276985075c582a69b8264dc65c065118dd85571feb21b6fe775d60d54be9177ed8df123ed9a2de2f10b61d7b0e7b39190557c'
             '2b5139637624f0b051dd0a19845fca3ffc9bc87ea0f6113459ab3f39a5970d1fc6ee58d2632696013bef9e802df131b2ccc4107c9b4cc7afda3acd02b8576b22'
-            '37f001e090f4e48fee05bddeaf54be47cabc75569b52f08429f0322c1c9cfccf7a3d146a687e92828efc469986c114d6433c10b1ce71974c0f416ab3686c1bef')
+            'ff0153e6162c9a12538886c97d706a9b85918929b4233baa1b88385938c23c095b6e3e6605918b524a805ef6def03ca024d2fbcdde677894101318ae759f5781')
 
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
diff --git a/config b/config
index 19af4d10fd19..1f910f6aa10e 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.6-arch1 Kernel Configuration
+# Linux/x86 5.10.12-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
@@ -5390,7 +5390,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_PLATFORM_SUPPORT=y
-# CONFIG_MEDIA_TEST_SUPPORT is not set
+CONFIG_MEDIA_TEST_SUPPORT=y
 # end of Media device types
 
 CONFIG_VIDEO_DEV=m
@@ -5418,6 +5418,11 @@ CONFIG_VIDEOBUF_VMALLOC=m
 # Media controller options
 #
 CONFIG_MEDIA_CONTROLLER_DVB=y
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
+
+#
+# Please notice that the enabled Media controller Request API is EXPERIMENTAL
+#
 # end of Media controller options
 
 #
@@ -5713,6 +5718,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
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_VIDEO_CADENCE=y
@@ -5727,6 +5733,15 @@ CONFIG_DVB_PLATFORM_DRIVERS=y
 # MMC/SDIO DVB adapters
 #
 CONFIG_SMS_SDIO_DRV=m
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIMC=m
+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_TEST_DRIVERS=y
+CONFIG_DVB_VIDTV=m
 
 #
 # FireWire (IEEE 1394) Adapters
@@ -6064,6 +6079,11 @@ CONFIG_DVB_HELENE=m
 #
 CONFIG_DVB_CXD2099=m
 CONFIG_DVB_SP2=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
 # end of Media ancillary drivers
 
 #