diff --git a/Makefile.rhelver b/Makefile.rhelver index 1805083e6..bd68da515 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 = 13 +RHEL_RELEASE = 14 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index b2f478c45..43b155c9e 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -2894,6 +2894,7 @@ CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set +# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set CONFIG_INPUT_SPARSEKMAP=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -3247,7 +3248,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_CAP11XX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set -# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO=m # CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 8bd6b4b7c..d9deaefcc 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -2878,6 +2878,7 @@ CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set +# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set CONFIG_INPUT_SPARSEKMAP=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -3226,7 +3227,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_CAP11XX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set -# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO=m # CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 42f970e8d..8b31a67ee 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2891,6 +2891,7 @@ CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set +# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set CONFIG_INPUT_SPARSEKMAP=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -3244,7 +3245,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_CAP11XX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set -# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO=m # CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index a06287d2b..8c2574e5c 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2875,6 +2875,7 @@ CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set +# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set CONFIG_INPUT_SPARSEKMAP=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -3223,7 +3224,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_CAP11XX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set -# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO=m # CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index c38ff55fe..aed2b1858 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -2931,6 +2931,7 @@ CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set +# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set CONFIG_INPUT_SPARSEKMAP=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -3284,7 +3285,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_CAP11XX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set -# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO=m # CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index e6167e252..3711baa93 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -2915,6 +2915,7 @@ CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set +# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set CONFIG_INPUT_SPARSEKMAP=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -3263,7 +3264,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_CAP11XX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set -# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO=m # CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set diff --git a/kernel.changelog b/kernel.changelog index 5ba642ed2..8e0facc7a 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,15 @@ -* Thu Jul 25 2024 Fedora Kernel Team [6.11.0-0.rc0.c33ffdb70cc6.13] +* Fri Jul 26 2024 Fedora Kernel Team [6.11.0-0.rc0.1722389b0d86.14] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: +* Fri Jul 26 2024 Fedora Kernel Team [6.11.0-0.rc0.1722389b0d86.13] +- gitlab-ci: restore bot pipeline behavior (Michael Hofmann) +- redhat/kernel.spec: drop extra right curly bracket in kernel_kvm_package (Jan Stancek) +- redhat/configs: enable gpio_keys driver for RHEL on aarch64 (Luiz Capitulino) +- Move NET_VENDOR_MICROCHIP from common to rhel (Justin M. Forbes) +- Linux v6.11.0-0.rc0.1722389b0d86 +Resolves: + * Thu Jul 25 2024 Fedora Kernel Team [6.11.0-0.rc0.c33ffdb70cc6.12] - Linux v6.11.0-0.rc0.c33ffdb70cc6 Resolves: diff --git a/kernel.spec b/kernel.spec index 6744a87e3..3d2d33612 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc0.20240725gitc33ffdb70cc6.13 +%define pkgrelease 0.rc0.20240726git1722389b0d86.14 %define kversion 6 -%define tarfile_release 6.10-12381-gc33ffdb70cc6 +%define tarfile_release 6.10-12562-g1722389b0d86 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20240725gitc33ffdb70cc6.13%{?buildid}%{?dist} +%define specrelease 0.rc0.20240726git1722389b0d86.14%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -1554,7 +1554,7 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{ %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\ %endif\ %if "%{1}" == "rt" || "%{1}" == "rt-debug"\ -%{expand:%%kernel_kvm_package %{?1:%{1}}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\ +%{expand:%%kernel_kvm_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\ %else \ %if %{with_efiuki}\ %package %{?1:%{1}-}uki-virt\ @@ -4043,9 +4043,16 @@ fi\ # # %changelog -* Thu Jul 25 2024 Fedora Kernel Team [6.11.0-0.rc0.c33ffdb70cc6.13] +* Fri Jul 26 2024 Fedora Kernel Team [6.11.0-0.rc0.1722389b0d86.14] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +* Fri Jul 26 2024 Fedora Kernel Team [6.11.0-0.rc0.1722389b0d86.13] +- gitlab-ci: restore bot pipeline behavior (Michael Hofmann) +- redhat/kernel.spec: drop extra right curly bracket in kernel_kvm_package (Jan Stancek) +- redhat/configs: enable gpio_keys driver for RHEL on aarch64 (Luiz Capitulino) +- Move NET_VENDOR_MICROCHIP from common to rhel (Justin M. Forbes) +- Linux v6.11.0-0.rc0.1722389b0d86 + * Thu Jul 25 2024 Fedora Kernel Team [6.11.0-0.rc0.c33ffdb70cc6.12] - Linux v6.11.0-0.rc0.c33ffdb70cc6 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 5c4836791..e80ffb28b 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -899,7 +899,7 @@ index e12b531f5c2f..082707f8dff8 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/char/random.c b/drivers/char/random.c -index b02a12436750..137c395b94da 100644 +index 87fe61295ea1..707f271e7728 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -51,6 +51,7 @@ @@ -1450,7 +1450,7 @@ index bf01f01964cf..703896981e8a 100644 platform_driver_unregister(&etm4_platform_driver); etm4_pm_clear(); diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c -index ef9ea295f9e0..0103334e8f32 100644 +index 2168b6cd7167..5d7cda175a0c 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -182,34 +182,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status, @@ -1898,7 +1898,7 @@ index f900e44243ae..316f461e5867 100644 { } diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index af2996d0d17f..e40e09d086b4 100644 +index f412ef73a6e4..e1d9079483ea 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -19,6 +19,7 @@ @@ -2495,10 +2495,10 @@ index 3130e0b5116b..2b51f6eefcd6 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index 9e36b6c1810e..2c355971056c 100644 +index 4cf89a4b4cbc..5133f3570000 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1616,6 +1616,7 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1614,6 +1614,7 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); @@ -2506,7 +2506,7 @@ index 9e36b6c1810e..2c355971056c 100644 int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass); -@@ -2664,6 +2665,10 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) +@@ -2662,6 +2663,10 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) return false; } @@ -3145,7 +3145,7 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index de3af33e6ff5..0a37270070e4 100644 +index 1390f1efb4f0..b9a8ccb1dbdc 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -507,6 +507,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); @@ -3194,7 +3194,7 @@ index 3c13240dfc9f..61b2ac156a3e 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 0719192a3482..25b20cad8e14 100644 +index bf6c5f685ea2..649f2fccaddd 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -26,6 +26,7 @@ @@ -3229,7 +3229,7 @@ index 0719192a3482..25b20cad8e14 100644 int sysctl_unprivileged_bpf_disabled __read_mostly = IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; -@@ -6033,6 +6051,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, +@@ -6033,6 +6051,11 @@ static int bpf_unpriv_handler(const struct ctl_table *table, int write, if (write && !ret) { if (locked_state && unpriv_enable != 1) return -EPERM; diff --git a/sources b/sources index caf173f76..e45c6387b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.10-12381-gc33ffdb70cc6.tar.xz) = 926dbedffae4529f5d62b0493e7378e04fd08143ef782ebd45b107ac7983a48e22577083d788aba57b70663ec624e8b2c281e5b11c68054b577dff5dfb85182c -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 51ddc035c1e079293464f691d5994444489044c3e666e29df29f497ac352f6fc9c38869e83ee1a5b54e2d60c804a4b588e81f97b05511348f511976cbc01b2f3 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = b3ce6df42b18c9363c0e0197678f80cfcbc59603a09363337d2920e5f69aa1fce030854c1e57dca725869f66eca93285168ae4f15b7dc01a15bfbc0008bdbf90 +SHA512 (linux-6.10-12562-g1722389b0d86.tar.xz) = d5b699352bfa644bdce8126e254106ac1315581dba9dab894807dfbf67fde92e61349b3d86e60e82ce4a53117b8a656bbf88f28cd30f7b0e6b23d1a6d3287b95 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = e55552cd89e1d2d440b7449331b35b1e7556ff89c6c1b791c3fc969b35b8867de10f5db05a636aa10dd35d517ee446de76d3df81c202b3c2fa2054c2bace2d78 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 6674302533896c1c8a73eb781105377696d0b40c2155070faa89f6bde84654c26cfba12d59db5edffb78c40b76a4665c9e8978568eb2a17caf5ceb80156667e6