diff --git a/Makefile.rhelver b/Makefile.rhelver index f5b0b5535..679d82097 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 = 60 +RHEL_RELEASE = 63 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 92fe13dad..e438ce856 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,15 @@ +* Mon Mar 11 2024 Fedora Kernel Team [6.8.0-63] +- Linux v6.8.0 +Resolves: + +* Sun Mar 10 2024 Fedora Kernel Team [6.8.0-0.rc7.005f6f34bd47.62] +- Linux v6.8.0-0.rc7.005f6f34bd47 +Resolves: + +* Sat Mar 09 2024 Fedora Kernel Team [6.8.0-0.rc7.09e5c48fea17.61] +- Linux v6.8.0-0.rc7.09e5c48fea17 +Resolves: + * Fri Mar 08 2024 Fedora Kernel Team [6.8.0-0.rc7.3aaa8ce7a335.60] - gitlab-ci: enable all variants for rawhide/eln builder image gating (Michael Hofmann) - Linux v6.8.0-0.rc7.3aaa8ce7a335 diff --git a/kernel.spec b/kernel.spec index c8e4db200..63eeb14d5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.0 %define specversion 6.8.0 %define patchversion 6.8 -%define pkgrelease 0.rc7.20240308git3aaa8ce7a335.60 +%define pkgrelease 63 %define kversion 6 -%define tarfile_release 6.8-rc7-142-g3aaa8ce7a335 +%define tarfile_release 6.8 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20240308git3aaa8ce7a335.60%{?buildid}%{?dist} +%define specrelease 63%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.0 @@ -3961,6 +3961,15 @@ fi\ # # %changelog +* Mon Mar 11 2024 Fedora Kernel Team [6.8.0-63] +- Linux v6.8.0 + +* Sun Mar 10 2024 Fedora Kernel Team [6.8.0-0.rc7.005f6f34bd47.62] +- Linux v6.8.0-0.rc7.005f6f34bd47 + +* Sat Mar 09 2024 Fedora Kernel Team [6.8.0-0.rc7.09e5c48fea17.61] +- Linux v6.8.0-0.rc7.09e5c48fea17 + * Fri Mar 08 2024 Fedora Kernel Team [6.8.0-0.rc7.3aaa8ce7a335.60] - gitlab-ci: enable all variants for rawhide/eln builder image gating (Michael Hofmann) - Linux v6.8.0-0.rc7.3aaa8ce7a335 diff --git a/patch-6.8-redhat.patch b/patch-6.8-redhat.patch index 2cb737280..cf6585eee 100644 --- a/patch-6.8-redhat.patch +++ b/patch-6.8-redhat.patch @@ -136,7 +136,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 0e36eff14608..3ed9c1bdd44a 100644 +index c7ee53f4bf04..a151f77036d7 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1403,7 +1403,7 @@ index ce1995a2827f..57f9e9de4747 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 258d5fe3d395..f7298e3dc8f3 100644 +index 42eaebb3bf5c..7a35119c3144 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, @@ -1566,9 +1566,9 @@ index 258d5fe3d395..f7298e3dc8f3 100644 } out: -@@ -981,6 +997,8 @@ static int rmi_driver_remove(struct device *dev) - irq_domain_remove(data->irqdomain); - data->irqdomain = NULL; +@@ -978,6 +994,8 @@ static int rmi_driver_remove(struct device *dev) + + rmi_disable_irq(rmi_dev, false); + cancel_work_sync(&data->attn_work); + diff --git a/sources b/sources index 37c72f2c6..6ea58c994 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.8-rc7-142-g3aaa8ce7a335.tar.xz) = 8592de592e618639f5a87e8380da8dddbe5866d814a3b666771e512aaab99b06d1a4931901ee9a6910d3987a90a14a81b561071f6a0cc7078388745ecf39ea40 -SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = 25bf9cdd0dcc69879bb0f672b59980c793d1e3bbe55039a720426f278781ac28699a8836abbe360af81159bc37fd6bea6c6f820e1d41dbde70fb602db83b6971 -SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 0da1d7691ddc33b2336f357a34afaa035ede700277a495fc09bbf4b497a1925e03310b1ce258c8b13007e27633a061809f52a1a099ebb15dc826b644ef29edea +SHA512 (linux-6.8.tar.xz) = a54e1db6bae0188f0e501aa0b5a146c37250a5abc3c450ff349cace1f0a223b513c5c481c74912dff3d3cb31e1b43dd6d6745c19b2a9dd8aea8f9e3f48fb3090 +SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = 2c4b320d912065be058c828af2d2d0a2c7fd1011171a05b14702e2ba3fd594d7e071a29c31fa9d371d8a8c66a9370003339f16a3b9b78cf27befcd15a4bdf968 +SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 42ca3006ef6d8637a71e90bc61d53252afa4f8635587d8e61f3553e8b2981cc5f7ceece9646b7470b4822af3f92b617c0453f15a1d3bd31fdc83e9dd02fadb40