up to 6.2.5

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 128fb2e4511edac47ff7696b1624f5fb2c3d4b32..8031e2f971d09dadb284d521243c716ea8270a59 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -2152,12 +2152,12 @@ DRM_I915_FORCE_PROBE all=""
 DRM_I915_CAPTURE_ERROR all=y
 DRM_I915_COMPRESS_ERROR all=y
 DRM_I915_USERPTR all=y
-DRM_I915_GVT all=y
 DRM_I915_GVT_KVMGT all=m
 DRM_I915_PXP all=y
 #- file drivers/gpu/drm/i915/Kconfig.debug goes here
 #- file drivers/gpu/drm/i915/Kconfig.profile goes here
 #- file drivers/gpu/drm/i915/Kconfig.unstable goes here
+DRM_I915_GVT all=y
 
 #-
 #- *** FILE: drivers/gpu/drm/imx/Kconfig ***
@@ -6761,6 +6761,7 @@ JME all=m
 #- file drivers/net/ethernet/microsoft/Kconfig goes here
 #- file drivers/net/ethernet/moxa/Kconfig goes here
 #- file drivers/net/ethernet/myricom/Kconfig goes here
+FEALNX all=m
 #- file drivers/net/ethernet/ni/Kconfig goes here
 #- file drivers/net/ethernet/natsemi/Kconfig goes here
 #- file drivers/net/ethernet/neterion/Kconfig goes here
@@ -14565,7 +14566,6 @@ DEFAULT_PFIFO_FAST all=n
 #- Classification
 NET_CLS all=y
 NET_CLS_BASIC all=m
-NET_CLS_TCINDEX all=m
 NET_CLS_ROUTE4 all=m
 NET_CLS_FW all=m
 NET_CLS_U32 all=m

diff --git a/kernel.spec b/kernel.spec
index 2f082f2932b2818ce6c1f9d6e6c359dda09c9e56..50fdb09abf9009f6e5d41bdb892a71e8c6eae8ba 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
 
 %define                rel             1
 %define                basever         6.2
-%define                postver         .4
+%define                postver         .5
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -121,7 +121,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
 # Source0-md5: 787862593d7bf354cf1a5c37e21fc147
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:  f74583e82cc74e5ee9423f8c819c9ceb
+# Patch0-md5:  92c45474c88c178daead199c0be39c03
 %endif
 Source1:       kernel.sysconfig