diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-19 13:10:28 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-19 13:10:28 +0100 |
| commit | 2c2db99fbfd6302a033230979d69639b245615b1 (patch) | |
| tree | 45f72f7e9e68e9017128fa492b651e6a8b96ee3b | |
| parent | 0a39b0ea6997de7ac045b728827191a405cf9f00 (diff) | |
| parent | 01c1b8b92901013d852ee5cbee82e08afb893921 (diff) | |
| download | kernel-2c2db99fbfd6302a033230979d69639b245615b1.tar.gz kernel-2c2db99fbfd6302a033230979d69639b245615b1.tar.xz kernel-2c2db99fbfd6302a033230979d69639b245615b1.zip | |
Merge remote-tracking branch 'origin/f36' into f36-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 8 | ||||
| -rw-r--r-- | patch-6.0-redhat.patch | 4 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index e1db8ed98..529b8c5e5 100755 --- a/kernel.spec +++ b/kernel.spec @@ -136,7 +136,7 @@ Summary: The Linux kernel # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 250%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.0.12 +%define kabiversion 6.0.13 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3186,6 +3186,12 @@ fi # # %changelog +* Wed Dec 14 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.13-200] +- Remove F35 from release_targets due to EOL (Justin M. Forbes) + +* Wed Dec 14 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.13-0] +- Linux v6.0.13 + * Thu Dec 08 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.12-0] - Add new config option for 6.0.12 backport (Justin M. Forbes) - Linux v6.0.12 diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index e5c992c87..bd91146c8 100644 --- a/patch-6.0-redhat.patch +++ b/patch-6.0-redhat.patch @@ -48,7 +48,7 @@ 47 files changed, 767 insertions(+), 365 deletions(-) diff --git a/Makefile b/Makefile -index 46c6eb57b354..ad3a206451ea 100644 +index bf00f3240b3a..f6fb779815ef 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1088,7 +1088,7 @@ index 3a808146b50f..c1a3f3057921 100644 * Changes the default domain of an iommu group that has *only* one device * diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index f612a0ba64d0..5c4a1ca36aec 100644 +index aca50bb93750..2f54b3560433 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1,3 +1,3 @@ -SHA512 (linux-6.0.12.tar.xz) = ff62a8298825ca6a9f7cecbd93d3b5547e3f06d0b4ea08739173866a5a7a660debc1488ba488a5c219d7758cd1a793e61df9799ca62f4bc814ad5a66d5866069 -SHA512 (kernel-abi-stablelists-6.0.12.tar.bz2) = ae6acbd3c024d6c2794cf8d55dda879e09e6d82d82f969118c8dc1a13556948526ed722a2b21bd44954f39f3541816f421e4ddc6fd8d93a0386cca8acfe8028b -SHA512 (kernel-kabi-dw-6.0.12.tar.bz2) = 2789aa4dd989267e15aa602aac9e4a085584c4db2162b504d2c0c02c94661c0988466723167c96fe9c79e3828ce4e88dd5a0447ef7e284b3f8af01927802c9f1 +SHA512 (linux-6.0.13.tar.xz) = e95da8f8db8bee4036b3430811c5883efa4195579b7bac23a45c30e96537375a02bb77d101c5a0fc5da36879cd0ecb1dcc652c6e8bac63ceb693eb959a4ea643 +SHA512 (kernel-abi-stablelists-6.0.13.tar.bz2) = 177ae955ff64b8a2c9b2063ad8cdc8de96662aa9937012ea58ac49896a0d6f3f58c6e08829413313b576cd9415a35d017d71fbc729b5f2619ac41c8247f6ad51 +SHA512 (kernel-kabi-dw-6.0.13.tar.bz2) = 766f9b1032469d66c41ea14fbeff03b6c24dc9da107ce61f70f9f3b230735643ca3fe7ec72a4c4b350959aa5081e7e4215f807acd85e651374afd6d9eddf4e0c |