sync with testing/linux, obs/linux-pf-next

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

3 files changed, 10 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83b481ad3349..9e6fe35b7236 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-pf-stable-git
 	pkgdesc = Linux pf-kernel (stable git version)
-	pkgver = 6.2.r1155773.9598e6c1f45f
+	pkgver = 6.2.r1157007.4ee087d62efc
 	pkgrel = 1
 	url = https://pfkernel.natalenko.name
 	arch = x86_64
@@ -15,7 +15,6 @@ pkgbase = linux-pf-stable-git
 	makedepends = gettext
 	makedepends = xmlto
 	makedepends = python-sphinx
-	makedepends = python-sphinx_rtd_theme
 	makedepends = graphviz
 	makedepends = imagemagick
 	makedepends = texlive-latexextra
@@ -24,7 +23,7 @@ pkgbase = linux-pf-stable-git
 	source = linux-pf-stable-git::git+https://codeberg.org/pf-kernel/linux.git#branch=pf-6.2
 	source = config
 	sha256sums = SKIP
-	sha256sums = dc67febd76c1980cb6bdf2681bf8fbe6da46f6fcb285070bfb3073baa16d8f25
+	sha256sums = d6d74cb62947b1afe70276acdb03bc53258cce6e44e0b9ba0c45ee5e97328d26
 
 pkgname = linux-pf-stable-git
 	pkgdesc = The Linux pf-kernel (stable git version) kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index a9db7fe97c2e..e463c5b547a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Based obs/linux-pf-next by Oleksandr Natalenko aka post-factum <oleksandr@natalenko.name>
 
 pkgbase=linux-pf-stable-git
-pkgver=6.2.r1155773.9598e6c1f45f
+pkgver=6.2.r1157007.4ee087d62efc
 pkgrel=1
 pkgdesc='Linux pf-kernel (stable git version)'
 _kernel_rel=6.2
@@ -14,7 +14,7 @@ arch=(x86_64)
 license=(GPL2)
 makedepends=(
   bc libelf pahole cpio perl tar xz gettext
-  xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra
+  xmlto python-sphinx graphviz imagemagick texlive-latexextra
   git
 )
 options=('!strip')
@@ -24,7 +24,7 @@ source=(
   config         # the main kernel config file
 )
 sha256sums=('SKIP'
-            'dc67febd76c1980cb6bdf2681bf8fbe6da46f6fcb285070bfb3073baa16d8f25')
+            'd6d74cb62947b1afe70276acdb03bc53258cce6e44e0b9ba0c45ee5e97328d26')
 
 pkgver() {
   cd $_srcname
diff --git a/config b/config
index 5f2f00bc8fbd..3a1e1472f48b 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.2.0-pf3 Kernel Configuration
+# Linux/x86 6.2.0-pf4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
 CONFIG_CC_IS_GCC=y
@@ -428,6 +428,7 @@ CONFIG_GENERIC_CPU2=y
 # CONFIG_MNATIVE_AMD is not set
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
@@ -1839,7 +1840,6 @@ CONFIG_DEFAULT_NET_SCH="fq_codel"
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -3367,6 +3367,7 @@ CONFIG_MICROSOFT_MANA=m
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
 CONFIG_NET_VENDOR_NI=y
 CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_NATSEMI=y
@@ -6688,7 +6689,6 @@ CONFIG_DRM_I915_FORCE_PROBE="*"
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
-CONFIG_DRM_I915_GVT=y
 CONFIG_DRM_I915_GVT_KVMGT=m
 CONFIG_DRM_I915_PXP=y
 CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
@@ -6700,6 +6700,7 @@ CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE=7500
 CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
 CONFIG_DRM_I915_STOP_TIMEOUT=100
 CONFIG_DRM_I915_TIMESLICE_DURATION=1
+CONFIG_DRM_I915_GVT=y
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX=m
@@ -7065,6 +7066,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
 CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
+# CONFIG_SND_HDA_CTL_DEV_ID is not set
 # end of HD-Audio
 
 CONFIG_SND_HDA_CORE=m