mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-02 02:51:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1742 from flatcar-linux/linux-5.15.30-main

Browse Source 
Upgrade Linux Kernel in main from 5.15.28 to 5.15.30
This commit is contained in:
Dongsu Park 2022-03-21 17:34:25 +01:00 committed by GitHub
commit 1385747481
7 changed files with 3 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-03-20-linux-5.15.30-update.md vendored Normal file
View File

@ -0,0 +1 @@
- Linux ([5.15.30](https://lwn.net/Articles/888521) (includes [5.15.29](https://lwn.net/Articles/888116)))

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.28.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.30.ebuild vendored
View File

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.28.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.30.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest vendored
View File

@ -1,2 +1,2 @@
DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST patch-5.15.28.xz 1198068 BLAKE2B b4f2717ec829688adabbaa1e4f1643a38776129420e640616bdb602a28fe02982b93e720998e382bf3ab9123cc9d596269b31d659de8345e4436d27b08e8adb2 SHA512 191ed5e562265d187cb48ea5825648b354dfd1e1cdf694b89e83cb630c1f54e1f1133d986c4aa856813840cb0c708ba7317615c1e5f02c5853f769e56a640e08
DIST patch-5.15.30.xz 1229208 BLAKE2B 188d40ba028947471343e50751a9a1a611827ad6f0fa5600061a0c9b370a06349998623cef642323f726e59fd5f8dec58cc468382cf824458f6cbcecef8f5171 SHA512 59520ca0ad26b57dd240d97ab79382953b6fdd0238c2cc8e52759ef1d5d903f09016f95b8213381ba08805385c5376bc82ed1958f81d8c05155dff1901b94d05

3
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.28.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.30.ebuild vendored
View File

@ -36,6 +36,5 @@ UNIPATCH_LIST="
${PATCH_DIR}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
${PATCH_DIR}/z0003-PCI-hv-Make-the-code-arch-neutral-by-adding-arch-spe.patch \
${PATCH_DIR}/z0004-PCI-hv-Add-arm64-Hyper-V-vPCI-support.patch \
${PATCH_DIR}/z0005-Revert-xfrm-state-and-policy-should-fail-if-XFRMA_IF.patch \
${PATCH_DIR}/z0006-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch \
${PATCH_DIR}/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch \
"

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch vendored
View File

67
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-xfrm-state-and-policy-should-fail-if-XFRMA_IF.patch vendored
View File

@ -1,67 +0,0 @@
From 509a0cc7c909899d76b2d7b0afd0124966358515 Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Mon, 28 Feb 2022 19:40:26 +0100
Subject: [PATCH 2/2] Revert "xfrm: state and policy should fail if XFRMA_IF_ID
0"
This reverts commit 68ac0f3810e76a853b5f7b90601a05c3048b8b54 because it
breaks userspace (e.g., Cilium is affected because it used id 0 for the
dummy state https://github.com/cilium/cilium/pull/18789).
Signed-off-by: Kai Lueke <kailuke@microsoft.com>
---
net/xfrm/xfrm_user.c | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 8cd6c8129004..be89a8ac54a4 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -630,13 +630,8 @@ static struct xfrm_state *xfrm_state_construct(struct net *net,
xfrm_smark_init(attrs, &x->props.smark);
- if (attrs[XFRMA_IF_ID]) {
+ if (attrs[XFRMA_IF_ID])
x->if_id = nla_get_u32(attrs[XFRMA_IF_ID]);
- if (!x->if_id) {
- err = -EINVAL;
- goto error;
- }
- }
err = __xfrm_init_state(x, false, attrs[XFRMA_OFFLOAD_DEV]);
if (err)
@@ -1432,13 +1427,8 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh,
mark = xfrm_mark_get(attrs, &m);
- if (attrs[XFRMA_IF_ID]) {
+ if (attrs[XFRMA_IF_ID])
if_id = nla_get_u32(attrs[XFRMA_IF_ID]);
- if (!if_id) {
- err = -EINVAL;
- goto out_noput;
- }
- }
if (p->info.seq) {
x = xfrm_find_acq_byseq(net, mark, p->info.seq);
@@ -1751,13 +1741,8 @@ static struct xfrm_policy *xfrm_policy_construct(struct net *net, struct xfrm_us
xfrm_mark_get(attrs, &xp->mark);
- if (attrs[XFRMA_IF_ID]) {
+ if (attrs[XFRMA_IF_ID])
xp->if_id = nla_get_u32(attrs[XFRMA_IF_ID]);
- if (!xp->if_id) {
- err = -EINVAL;
- goto error;
- }
- }
return xp;
error:
--
2.35.1