From ae4509942ddff9d56a51c37eb2a4d1fdcdab72e2 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 2 May 2023 07:10:11 -0500 Subject: [PATCH] kernel-6.4.0-0.rc0.20230502git865fdb08197e.11 * Tue May 02 2023 Fedora Kernel Team [6.4.0-0.rc0.865fdb08197e.11] - Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64 (Justin M. Forbes) - redhat/Makefile: Support building linux-next (Thorsten Leemhuis) - redhat/Makefile: support building stable-rc versions (Thorsten Leemhuis) - redhat/Makefile: Add target to print DISTRELEASETAG (Thorsten Leemhuis) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel-aarch64-debug-fedora.config | 2 ++ kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 2 ++ kernel-aarch64-rhel.config | 1 + kernel-armv7hl-debug-fedora.config | 2 ++ kernel-armv7hl-fedora.config | 2 ++ kernel-armv7hl-lpae-debug-fedora.config | 2 ++ kernel-armv7hl-lpae-fedora.config | 2 ++ kernel-ppc64le-debug-fedora.config | 2 ++ kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-fedora.config | 2 ++ kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-fedora.config | 2 ++ kernel-s390x-debug-rhel.config | 1 + kernel-s390x-fedora.config | 2 ++ kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-fedora.config | 2 ++ kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-fedora.config | 2 ++ kernel-x86_64-rhel.config | 1 + kernel.spec | 24 +++++++++++++++++++----- sources | 6 +++--- 25 files changed, 58 insertions(+), 11 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 9ff2043ca..7f148a411 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 = 10 +RHEL_RELEASE = 11 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index c71212a25..ce811da29 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/a2e2a1e7ec53e4cf678d8af50163debfc3a7c57a - a2e2a1e7ec53e4cf678d8af50163debfc3a7c57a Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64 +"https://gitlab.com/cki-project/kernel-ark/-/commit"/5d7d29545df70fc71997fe4f90a7b3cd0991122c + 5d7d29545df70fc71997fe4f90a7b3cd0991122c Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64 "https://gitlab.com/cki-project/kernel-ark/-/commit"/89cb9c58c541e6e6a7c388fd2122339d40c9c606 89cb9c58c541e6e6a7c388fd2122339d40c9c606 redhat: version two of Makefile.rhelver tweaks diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index a9eca1415..f20e09ab7 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3212,6 +3212,7 @@ CONFIG_INPUT_APANEL=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set CONFIG_INPUT_AXP20X_PEK=m +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_CM109 is not set CONFIG_INPUT_CMA3000_I2C=m @@ -8346,6 +8347,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index e314d2d6d..a96a886a6 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -6653,6 +6653,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set # CONFIG_TOUCHSCREEN_RM_TS is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 479b2c7c9..163b0133b 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3195,6 +3195,7 @@ CONFIG_INPUT_APANEL=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set CONFIG_INPUT_AXP20X_PEK=m +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_CM109 is not set CONFIG_INPUT_CMA3000_I2C=m @@ -8317,6 +8318,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index ac0a24acf..4f0a70c8b 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -6628,6 +6628,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set # CONFIG_TOUCHSCREEN_RM_TS is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 31019e484..73f1e5e38 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -3169,6 +3169,7 @@ CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set CONFIG_INPUT_AXP20X_PEK=m +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000_I2C=m @@ -8373,6 +8374,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 7071854db..89fbd20e2 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -3153,6 +3153,7 @@ CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set CONFIG_INPUT_AXP20X_PEK=m +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000_I2C=m @@ -8346,6 +8347,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 5ce1288a4..75aa23ed0 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -3113,6 +3113,7 @@ CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set CONFIG_INPUT_AXP20X_PEK=m +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000_I2C=m @@ -8148,6 +8149,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 64f96fbc2..bd1283b9d 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -3097,6 +3097,7 @@ CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set CONFIG_INPUT_AXP20X_PEK=m +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000_I2C=m @@ -8121,6 +8122,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 9d03a04c9..0b0025858 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2587,6 +2587,7 @@ CONFIG_INPUT_APANEL=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000_I2C=m @@ -6988,6 +6989,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RM_TS=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 2a2cec518..e781ee8d7 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -6330,6 +6330,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set # CONFIG_TOUCHSCREEN_RM_TS is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 9a0cda62f..0ef98e2a0 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2567,6 +2567,7 @@ CONFIG_INPUT_APANEL=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000_I2C=m @@ -6957,6 +6958,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RM_TS=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index e6faa42f1..4b2e5e622 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -6307,6 +6307,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set # CONFIG_TOUCHSCREEN_RM_TS is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index f3a3bf901..400e811c8 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2566,6 +2566,7 @@ CONFIG_INPUT_APANEL=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000_I2C=m @@ -6929,6 +6930,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RM_TS=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 93acc6363..4ae74dffd 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -6309,6 +6309,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set # CONFIG_TOUCHSCREEN_RM_TS is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 1fef95ea5..872d8ab98 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2546,6 +2546,7 @@ CONFIG_INPUT_APANEL=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000_I2C=m @@ -6898,6 +6899,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RM_TS=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d27490bc7..0bddf323d 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -6286,6 +6286,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set # CONFIG_TOUCHSCREEN_RM_TS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 346dd466a..6384a8a32 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -6311,6 +6311,7 @@ CONFIG_TN3270=y # CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set # CONFIG_TOUCHSCREEN_RM_TS is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 7ffc4d942..042d0022e 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2795,6 +2795,7 @@ CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set CONFIG_INPUT_AXP20X_PEK=m +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000_I2C=m @@ -7397,6 +7398,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m CONFIG_TOUCHSCREEN_MTOUCH=m +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RM_TS=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index ec065d511..1732389a9 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -6569,6 +6569,7 @@ CONFIG_TOUCHSCREEN_ELO=m # CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set # CONFIG_TOUCHSCREEN_RM_TS is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 4a5126767..2da24ab9e 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2775,6 +2775,7 @@ CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set CONFIG_INPUT_AXP20X_PEK=m +# CONFIG_INPUT_BBNSM_PWRKEY is not set # CONFIG_INPUT_BMA150 is not set CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000_I2C=m @@ -7367,6 +7368,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MSG2638=m CONFIG_TOUCHSCREEN_MTOUCH=m +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_RM_TS=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 538bba271..8c5dafe70 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -6545,6 +6545,7 @@ CONFIG_TOUCHSCREEN_ELO=m # CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set # CONFIG_TOUCHSCREEN_RM_TS is not set diff --git a/kernel.spec b/kernel.spec index 2e4b86f69..3c1ad08e6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -148,13 +148,13 @@ Summary: The Linux kernel %define specrpmversion 6.4.0 %define specversion 6.4.0 %define patchversion 6.4 -%define pkgrelease 0.rc0.20230501git58390c8ce1bd.10 +%define pkgrelease 0.rc0.20230502git865fdb08197e.11 %define kversion 6 -%define tarfile_release 6.3-12049-g58390c8ce1bd +%define tarfile_release 6.3-12423-g865fdb08197e # This is needed to do merge window version magic %define patchlevel 4 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20230501git58390c8ce1bd.10%{?buildid}%{?dist} +%define specrelease 0.rc0.20230502git865fdb08197e.11%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.4.0 @@ -2557,7 +2557,7 @@ pushd tools/testing/selftests force_targets="" %endif -%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install +%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install # 'make install' for bpf is broken and upstream refuses to fix it. # Install the needed files manually. @@ -2573,7 +2573,9 @@ for dir in bpf bpf/no_alu32 bpf/progs; do -name '*.o' -exec sh -c 'readelf -h "{}" | grep -q "^ Machine:.*BPF"' \; \) -print0 | \ xargs -0 cp -t %{buildroot}%{_libexecdir}/kselftests/$dir || true done +ln -sr %{buildroot}%{_libexecdir}/kselftests/bpf/bpftool %{buildroot}%{_libexecdir}/kselftests/bpf/no_alu32/bpftool %buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs" +%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs-no_alu32" popd export -n BPFTOOL %endif @@ -2861,6 +2863,12 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/ find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/netdevsim/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/netdevsim/{} \; popd +# install drivers/net/bonding selftests +pushd tools/testing/selftests/drivers/net/bonding +find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/bonding/{} \; +find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/bonding/{} \; +find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/bonding/{} \; +popd # install net/forwarding selftests pushd tools/testing/selftests/net/forwarding find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/net/forwarding/{} \; @@ -3402,12 +3410,18 @@ fi # # %changelog -* Mon May 01 2023 Fedora Kernel Team [6.4.0-0.rc0.58390c8ce1bd.10] +* Tue May 02 2023 Fedora Kernel Team [6.4.0-0.rc0.865fdb08197e.11] - Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64 (Justin M. Forbes) - redhat/Makefile: Support building linux-next (Thorsten Leemhuis) - redhat/Makefile: support building stable-rc versions (Thorsten Leemhuis) - redhat/Makefile: Add target to print DISTRELEASETAG (Thorsten Leemhuis) +* Tue May 02 2023 Fedora Kernel Team [6.4.0-0.rc0.865fdb08197e.10] +- kernel.spec: package unstripped test_progs-no_alu32 (Felix Maurer) +- bpf/selftests: fix bpf selftests install (Jerome Marchand) +- kernel.spec: add bonding selftest (Hangbin Liu) +- Linux v6.4.0-0.rc0.865fdb08197e + * Mon May 01 2023 Fedora Kernel Team [6.4.0-0.rc0.58390c8ce1bd.9] - Change FORCE_MAX_ORDER for ppc64 to be 8 (Justin M. Forbes) - kernel.spec.template: Add global compression variables (Prarit Bhargava) diff --git a/sources b/sources index fea65746e..c6020efc3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.3-12049-g58390c8ce1bd.tar.xz) = dda37e55b7e6f828b7cedc57aabd6f0768cb4f142656783b6dc600ca3ec8e727202cec9be27f7a1003fafb7c753986e00c705ce6c66e8acbfdbfc2b00d9604eb -SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 9b02cebe9d1d929cc466bbdc9f6c75288d8832ffedef3d72465a399932c4c68d3e277209f045c49a0ef64418c5e23590c45b531a386382ec1b4f5848b27b1f48 -SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 5f8897c7532f9140c0b67bc8f1553590de30377c3e2a83ad9e64dace7176bf10ef71aeeaeb60f1bbafcedb3ffae3c0018397ad32362d9c248f2933bf230e67b9 +SHA512 (linux-6.3-12423-g865fdb08197e.tar.xz) = 722bdd7c2ece7977f6c9842e06098179c8ccb48a1a25abac1204b0c7de05792950b905ad36fca81cc0bff7b40e01ecf6a507b3ade284b7afb585832d79a98e4e +SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = d60d4b02563ad387dc2c21f94b32e24d067471c1c8b3fe272220b85de3d799c76609f64867e82d30de06715f83dd23aba759ca2bebfe1e324c0c255f3bbc4a53 +SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 73c56ae3bd5dae28ff148b876224d715a9d37b2730f2be7737227b324f8711baca308759a4c7031b5a140f2d8a3defad3554891c1fa8b7fb434572c49f8ca078