From 82654c1ea86080101da510e00bb901507a128f78 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Thu, 29 Jun 2023 07:15:46 +0000 Subject: [PATCH 1/2] sys-kernel/coreos-sources: Update from 5.15.117 to 5.15.119 --- changelog/updates/2023-06-29-linux-5.15.119-update.md | 1 + ...eos-kernel-5.15.117.ebuild => coreos-kernel-5.15.119.ebuild} | 0 ...s-modules-5.15.117.ebuild => coreos-modules-5.15.119.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...s-sources-5.15.117.ebuild => coreos-sources-5.15.119.ebuild} | 0 5 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/updates/2023-06-29-linux-5.15.119-update.md rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-5.15.117.ebuild => coreos-kernel-5.15.119.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-5.15.117.ebuild => coreos-modules-5.15.119.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-5.15.117.ebuild => coreos-sources-5.15.119.ebuild} (100%) diff --git a/changelog/updates/2023-06-29-linux-5.15.119-update.md b/changelog/updates/2023-06-29-linux-5.15.119-update.md new file mode 100644 index 0000000000..6d4ff0900b --- /dev/null +++ b/changelog/updates/2023-06-29-linux-5.15.119-update.md @@ -0,0 +1 @@ +- Linux ([5.15.119](https://lwn.net/Articles/936675) (includes [5.15.118](https://lwn.net/Articles/935584))) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.117.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.119.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.117.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.119.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.117.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.119.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.117.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.119.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index 6edb4fb9e3..8d8fc894ff 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a -DIST patch-5.15.117.xz 4223008 BLAKE2B 2476c13abdc517875a17228ba2d27a1f45e069fbb89fe2fd8a0fe0132e82d83b6de1391bb9cd3a163ae8ff2a408cc93ad79e2897a3c6c1241ec5d67b84a37781 SHA512 b75d1bb441f8409c68f1893ec5648399617eed15899cbeef0a701fc47eaccaaac17b80e80987efd852f9e7d8bdcab78db4bb328cbf06677eb4bc5b309efb9090 +DIST patch-5.15.119.xz 4328336 BLAKE2B ea63486fd3f3f29f426a629e10ba63f222c9ccc5fbe5a9f13e4e36e99a64c2574d02633ae82e70167a9cf5630ff5e958bfec8f2ba3ec2b7d878ae998adc761ca SHA512 8a05f41f8ed5d6f35c7a5c5650ded1d85bf8b868b0c2ef7ad05d34e5b2741b7860b801837fd0d5bf5ab942909f3e81803e7d8dbcd1360470990768abd62db420 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.117.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.119.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.117.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.119.ebuild From 27abaa496794e0902245e7a435c4db08bac20155 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 3 Jul 2023 12:51:07 +0200 Subject: [PATCH 2/2] sys-kernel/coreos-sources: adjust Hyper-V patch for 5.15.119 Since 5.15.119 or newer changed Hyper-V code via 34e21b8ff3e6 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=34e21b8ff3e6445baedb813b2ba8d306d6f312c8, it is necessary to adjust the z0006 patch of Flatcar to apply the patch. --- ...-hv-Avoid-the-retarget-interrupt-hypercall-in-irq.patch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-PCI-hv-Avoid-the-retarget-interrupt-hypercall-in-irq.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-PCI-hv-Avoid-the-retarget-interrupt-hypercall-in-irq.patch index e95fbd646c..805870792b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-PCI-hv-Avoid-the-retarget-interrupt-hypercall-in-irq.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-PCI-hv-Avoid-the-retarget-interrupt-hypercall-in-irq.patch @@ -173,7 +173,7 @@ index 42c625bc5944..165dfb98d3d8 100644 #endif /* CONFIG_ARM64 */ /** -@@ -1462,122 +1586,9 @@ static void hv_irq_mask(struct irq_data *data) +@@ -1462,127 +1586,9 @@ static void hv_irq_mask(struct irq_data *data) irq_chip_mask_parent(data); } @@ -207,6 +207,11 @@ index 42c625bc5944..165dfb98d3d8 100644 - pbus = pdev->bus; - hbus = container_of(pbus->sysdata, struct hv_pcibus_device, sysdata); - int_desc = data->chip_data; +- if (!int_desc) { +- dev_warn(&hbus->hdev->device, "%s() can not unmask irq %u\n", +- __func__, data->irq); +- return; +- } - - spin_lock_irqsave(&hbus->retarget_msi_interrupt_lock, flags); -