From c9674c94f5cf3efa22312b0d15cea16d9273c140 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 23 Jun 2023 11:46:01 -0500 Subject: [PATCH] kernel-6.4.0-0.rc7.20230623git8a28a0b6f1a1.57 * Fri Jun 23 2023 Fedora Kernel Team [6.4.0-0.rc7.8a28a0b6f1a1.57] - redhat/configs: Disable qcom armv7 drippings in the aarch64 tree (Jeremy Linton) - Linux v6.4.0-0.rc7.8a28a0b6f1a1 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 16 ++++++++-------- kernel-aarch64-fedora.config | 16 ++++++++-------- kernel.spec | 10 +++++++--- patch-6.4-redhat.patch | 4 ++-- sources | 6 +++--- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 5da85be4c..945b2fca7 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 56 +RHEL_RELEASE = 57 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 1842c9988..fb12ea663 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -271,8 +271,8 @@ CONFIG_APPLE_RTKIT=m CONFIG_APPLE_SART=m CONFIG_APPLE_WATCHDOG=m # CONFIG_APPLICOM is not set -CONFIG_APQ_GCC_8084=y -CONFIG_APQ_MMCC_8084=m +# CONFIG_APQ_GCC_8084 is not set +# CONFIG_APQ_MMCC_8084 is not set CONFIG_AQTION=m CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m @@ -1899,7 +1899,7 @@ CONFIG_DRM_MSM_DP=y CONFIG_DRM_MSM_DSI_10NM_PHY=y CONFIG_DRM_MSM_DSI_14NM_PHY=y CONFIG_DRM_MSM_DSI_20NM_PHY=y -CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y +# CONFIG_DRM_MSM_DSI_28NM_8960_PHY is not set CONFIG_DRM_MSM_DSI_28NM_PHY=y CONFIG_DRM_MSM_DSI_7NM_PHY=y CONFIG_DRM_MSM_DSI=y @@ -4466,22 +4466,22 @@ CONFIG_MSA311=m CONFIG_MSDOS_FS=m CONFIG_MSDOS_PARTITION=y CONFIG_MSE102X=m -CONFIG_MSM_GCC_8660=y +# CONFIG_MSM_GCC_8660 is not set # CONFIG_MSM_GCC_8909 is not set CONFIG_MSM_GCC_8916=y # CONFIG_MSM_GCC_8917 is not set CONFIG_MSM_GCC_8939=m # CONFIG_MSM_GCC_8953 is not set -CONFIG_MSM_GCC_8960=y -CONFIG_MSM_GCC_8974=y +# CONFIG_MSM_GCC_8960 is not set +# CONFIG_MSM_GCC_8974 is not set # CONFIG_MSM_GCC_8976 is not set # CONFIG_MSM_GCC_8994 is not set CONFIG_MSM_GCC_8996=y CONFIG_MSM_GCC_8998=y CONFIG_MSM_GPUCC_8998=m # CONFIG_MSM_LCC_8960 is not set -CONFIG_MSM_MMCC_8960=m -CONFIG_MSM_MMCC_8974=m +# CONFIG_MSM_MMCC_8960 is not set +# CONFIG_MSM_MMCC_8974 is not set # CONFIG_MSM_MMCC_8994 is not set CONFIG_MSM_MMCC_8996=m # CONFIG_MSM_MMCC_8998 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index f02d29857..997929b93 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -271,8 +271,8 @@ CONFIG_APPLE_RTKIT=m CONFIG_APPLE_SART=m CONFIG_APPLE_WATCHDOG=m # CONFIG_APPLICOM is not set -CONFIG_APQ_GCC_8084=y -CONFIG_APQ_MMCC_8084=m +# CONFIG_APQ_GCC_8084 is not set +# CONFIG_APQ_MMCC_8084 is not set CONFIG_AQTION=m CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m @@ -1890,7 +1890,7 @@ CONFIG_DRM_MSM_DP=y CONFIG_DRM_MSM_DSI_10NM_PHY=y CONFIG_DRM_MSM_DSI_14NM_PHY=y CONFIG_DRM_MSM_DSI_20NM_PHY=y -CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y +# CONFIG_DRM_MSM_DSI_28NM_8960_PHY is not set CONFIG_DRM_MSM_DSI_28NM_PHY=y CONFIG_DRM_MSM_DSI_7NM_PHY=y CONFIG_DRM_MSM_DSI=y @@ -4440,22 +4440,22 @@ CONFIG_MSA311=m CONFIG_MSDOS_FS=m CONFIG_MSDOS_PARTITION=y CONFIG_MSE102X=m -CONFIG_MSM_GCC_8660=y +# CONFIG_MSM_GCC_8660 is not set # CONFIG_MSM_GCC_8909 is not set CONFIG_MSM_GCC_8916=y # CONFIG_MSM_GCC_8917 is not set CONFIG_MSM_GCC_8939=m # CONFIG_MSM_GCC_8953 is not set -CONFIG_MSM_GCC_8960=y -CONFIG_MSM_GCC_8974=y +# CONFIG_MSM_GCC_8960 is not set +# CONFIG_MSM_GCC_8974 is not set # CONFIG_MSM_GCC_8976 is not set # CONFIG_MSM_GCC_8994 is not set CONFIG_MSM_GCC_8996=y CONFIG_MSM_GCC_8998=y CONFIG_MSM_GPUCC_8998=m # CONFIG_MSM_LCC_8960 is not set -CONFIG_MSM_MMCC_8960=m -CONFIG_MSM_MMCC_8974=m +# CONFIG_MSM_MMCC_8960 is not set +# CONFIG_MSM_MMCC_8974 is not set # CONFIG_MSM_MMCC_8994 is not set CONFIG_MSM_MMCC_8996=m # CONFIG_MSM_MMCC_8998 is not set diff --git a/kernel.spec b/kernel.spec index 5717efb38..8e206503a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -174,13 +174,13 @@ Summary: The Linux kernel %define specrpmversion 6.4.0 %define specversion 6.4.0 %define patchversion 6.4 -%define pkgrelease 0.rc7.20230622gitdad9774deaf1.56 +%define pkgrelease 0.rc7.20230623git8a28a0b6f1a1.57 %define kversion 6 -%define tarfile_release 6.4-rc7-72-gdad9774deaf1 +%define tarfile_release 6.4-rc7-194-g8a28a0b6f1a1 # This is needed to do merge window version magic %define patchlevel 4 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20230622gitdad9774deaf1.56%{?buildid}%{?dist} +%define specrelease 0.rc7.20230623git8a28a0b6f1a1.57%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.4.0 @@ -3700,6 +3700,10 @@ fi\ # # %changelog +* Fri Jun 23 2023 Fedora Kernel Team [6.4.0-0.rc7.8a28a0b6f1a1.57] +- redhat/configs: Disable qcom armv7 drippings in the aarch64 tree (Jeremy Linton) +- Linux v6.4.0-0.rc7.8a28a0b6f1a1 + * Thu Jun 22 2023 Fedora Kernel Team [6.4.0-0.rc7.dad9774deaf1.56] - kernel.spec: drop obsolete ldconfig (Jan Stancek) - Consolidate config items to common for 6.4 cycle (Justin M. Forbes) diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch index 8874ed00f..ba4f97d7a 100644 --- a/patch-6.4-redhat.patch +++ b/patch-6.4-redhat.patch @@ -2510,7 +2510,7 @@ index b69c95315480..6296043efe36 100644 obj-$(CONFIG_MULTIUSER) += groups.o obj-$(CONFIG_VHOST_TASK) += vhost_task.o diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 0c21d0d8efe4..9a7ea786dfe2 100644 +index f1c8733f76b8..e8260e8c8aa1 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -26,6 +26,7 @@ @@ -2545,7 +2545,7 @@ index 0c21d0d8efe4..9a7ea786dfe2 100644 int sysctl_unprivileged_bpf_disabled __read_mostly = IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; -@@ -5386,6 +5404,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, +@@ -5391,6 +5409,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, if (write && !ret) { if (locked_state && unpriv_enable != 1) return -EPERM; diff --git a/sources b/sources index ac3dcfdba..2355a599c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.4-rc7-72-gdad9774deaf1.tar.xz) = bfc89a21db05d615d4a591e2fe0cbae9a1411094142df61d900a8f8781614011cc5cdffc27fcebd6716f9e8445a5208b20cec508abac34daeef4a2262f652c49 -SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 1e6ce4dd5cbdf0f3d543a9e063f4ad02cfa516f5cdc0173c697bae8aa0da38d528939d6af95c23aef8d97ae1aeb01bb1f3e3e2e93f0c839921930258c8c47af6 -SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 6d0746b4314421a8f9284d8334e3bc5f01a1ec5578305480aaf7e2df0b39427b0e3bcdfa648488c8a6065d4464f5565286c86c44462b4912a3247096b0335c0f +SHA512 (linux-6.4-rc7-194-g8a28a0b6f1a1.tar.xz) = ba41087299ebcaebf2b1b19f60ea76e3a7e8f63c1b2d6522cfaf889d411a2ea6f34a4fb06636dc6f68cf5c0aaae762c4a83b3d743f0cfab5ae72ba0faf02f863 +SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 69889d0a2466af14f80903667c9b2d3b147d998a34957dea9f69141173f5a1084f0d8b27f98749ba31921faf3597fe9357b6cda45375bf8f182a0ad18f33ca37 +SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 388683a3e3544c2bb0f6429dad1cd237ac492bf7d9c4abfe660da1e394161a4dfe692643a76c0239d5d9c486c6221879398f76b4f6d237fcffb9c97ed3e2f80e