diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.7.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.17.9.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.7.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.17.9.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 cf1fce02be..227f01465c 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,4 +1,4 @@ DIST linux-4.14.tar.xz 100770500 SHA256 f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 WHIRLPOOL fee10d54ecb210156aa55364ecc15867127819e9f7ff9ec5f6ef159b1013e2ae3d3a28d35c62d663886cbe826b996a1387671766093be002536309045a8e4d10 DIST linux-4.17.tar.xz 102165892 SHA256 9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db WHIRLPOOL 60573a6837a5daae91ea8d36f7aea0439a398d47810524df378b37df20ebb6fa83d518380348ec66cfe8f94b2405de59f884d52ac879cb4ff78f6674ad322077 DIST patch-4.14.56.xz 1467480 SHA256 a6d6b834e7df08aef500053fc007633166d6d01416c6bd3413c164e260a5d809 SHA512 422d8c076f6855bf5047b334ad7f2cd7a33c06e23aded9a23e50818ca5f3657eb619838aded84fe9a9a5057aa7e44f997b57dc0a4fa4ff7fd1c1f1655dccbd24 WHIRLPOOL 21b35603f3a70cc6b66e8054ad78c24574a0e870e1e0059979235267c62d96b609346dc095cd09e198214be9c82ab744533c6bcf3fbf33672e1cfdb342e261cc -DIST patch-4.17.7.xz 163088 SHA256 7f96003274d45fabda457951919c68a5856c7b40e4ee230baa0492dd8caf2e97 SHA512 955342b78da2977dbd08ff0acb7e681c646b1dfceef71246a08bdd102e0b2ad41f3eb7c353755ed1da2e1a5d9138476adc7bf11fd732a3033b6f8aac457dac75 WHIRLPOOL 5ef06bc03015c90df57c1137afd1abc75d337edcccffbb2f03128865b6169459a25c48eda75d58c0e3a912d70301122da2969928422def00abfe6c7a23734149 +DIST patch-4.17.9.xz 197264 SHA256 52131a497efaed724afaa7f7022249f8f8e6e555cbe407a6619908ed2ebcee89 SHA512 4fce83a490b9127a37e50b783bad590cd01c5a3442fa1913a0d581e8083b1a3729bb54286a16321c003995af2ce3e62874423f62cdd10673a5b0bf444616c666 WHIRLPOOL 7e9abfb844fd3726d70e02d0d2f8f242ce34f718f93cde1c9fee6293e8489af6b9fdfe03cced6d2a28cb7f7b57681c086526b3f67835128b9750c78688863308 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.9.ebuild similarity index 86% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.7.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.9.ebuild index 1d3b1187cc..fda167a8ac 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.7.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.9.ebuild @@ -38,7 +38,5 @@ UNIPATCH_LIST=" ${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch \ ${PATCH_DIR}/z0002-Add-arm64-coreos-verity-hash.patch \ ${PATCH_DIR}/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ - ${PATCH_DIR}/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch \ - ${PATCH_DIR}/z0005-xen-netfront-Update-features-after-registering-netde.patch \ - ${PATCH_DIR}/z0006-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch \ + ${PATCH_DIR}/z0004-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index 98feb406b8..f18f3b3c52 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,7 +1,7 @@ -From cdebb1ec94b5dd0309bee5e8d9dab6840c0b7a56 Mon Sep 17 00:00:00 2001 +From acd61ec585f433203b07a640c755966c4a2ca55e Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/6] kbuild: derive relative path for KBUILD_SRC from CURDIR +Subject: [PATCH 1/4] kbuild: derive relative path for KBUILD_SRC from CURDIR This enables relocating source and build trees to different roots, provided they stay reachable relative to one another. Useful for @@ -12,7 +12,7 @@ by some undesirable path component. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 5c9f331f29c0..b5edb3ccd223 100644 +index 693fde3aa317..5c760c969007 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0002-Add-arm64-coreos-verity-hash.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0002-Add-arm64-coreos-verity-hash.patch index 3508cdca00..617ef548c6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0002-Add-arm64-coreos-verity-hash.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0002-Add-arm64-coreos-verity-hash.patch @@ -1,7 +1,7 @@ -From 2b1ecc53c4a9407dfba281ac6a07443b12fa64b0 Mon Sep 17 00:00:00 2001 +From 06b3be2f50da5017ecde7143bc1f75758c40e8df Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 11 Nov 2016 17:28:52 -0800 -Subject: [PATCH 2/6] Add arm64 coreos verity hash +Subject: [PATCH 2/4] Add arm64 coreos verity hash Signed-off-by: Geoff Levand --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 11bfb5ad3d..e4017c3e77 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,7 +1,7 @@ -From 7c6f5b3b82b75b9dc08a41a51bec3ce4ab4bcad3 Mon Sep 17 00:00:00 2001 +From 39041f58574f56f752b1dad15f79f4481238f581 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 -Subject: [PATCH 3/6] tools/objtool/Makefile: Don't fail on fallthrough with +Subject: [PATCH 3/4] tools/objtool/Makefile: Don't fail on fallthrough with new GCCs --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0006-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0006-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch index dcedec17e7..648d52dfc7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0006-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch @@ -1,7 +1,7 @@ -From 84fbc45d2085cdfc06a633890a32f7fd9be4a1d1 Mon Sep 17 00:00:00 2001 +From 836ef3dc459a6be5c9640320b2961f573793531f Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Wed, 4 Jul 2018 18:08:57 +0300 -Subject: [PATCH 6/6] 4.17.x won't boot due to "x86/boot/compressed/64: Handle +Subject: [PATCH 4/4] 4.17.x won't boot due to "x86/boot/compressed/64: Handle 5-level paging boot if kernel is above 4G" On Tue, Jul 03, 2018 at 05:21:50PM +0300, Kirill A. Shutemov wrote: diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch deleted file mode 100644 index d74c8ebfe9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 54add00a156cfb7d865c150a6212fa232c30df8f Mon Sep 17 00:00:00 2001 -From: Ross Lagerwall -Date: Thu, 21 Jun 2018 14:00:20 +0100 -Subject: [PATCH 4/6] xen-netfront: Fix mismatched rtnl_unlock - -Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open") -Reported-by: Ben Hutchings -Signed-off-by: Ross Lagerwall -Reviewed-by: Juergen Gross -Signed-off-by: David S. Miller ---- - drivers/net/xen-netfront.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c -index 4dd0668003e7..244095bfd604 100644 ---- a/drivers/net/xen-netfront.c -+++ b/drivers/net/xen-netfront.c -@@ -1810,7 +1810,7 @@ static int talk_to_netback(struct xenbus_device *dev, - err = xen_net_read_mac(dev, info->netdev->dev_addr); - if (err) { - xenbus_dev_fatal(dev, err, "parsing %s/mac", dev->nodename); -- goto out; -+ goto out_unlocked; - } - - rtnl_lock(); -@@ -1925,6 +1925,7 @@ static int talk_to_netback(struct xenbus_device *dev, - xennet_destroy_queues(info); - out: - rtnl_unlock(); -+out_unlocked: - device_unregister(&dev->dev); - return err; - } --- -2.17.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-xen-netfront-Update-features-after-registering-netde.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-xen-netfront-Update-features-after-registering-netde.patch deleted file mode 100644 index 7b26b88026..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-xen-netfront-Update-features-after-registering-netde.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e0b96e31c6c6f4f7bb45a0fa902d48d524089dec Mon Sep 17 00:00:00 2001 -From: Ross Lagerwall -Date: Thu, 21 Jun 2018 14:00:21 +0100 -Subject: [PATCH 5/6] xen-netfront: Update features after registering netdev - -Update the features after calling register_netdev() otherwise the -device features are not set up correctly and it not possible to change -the MTU of the device. After this change, the features reported by -ethtool match the device's features before the commit which introduced -the issue and it is possible to change the device's MTU. - -Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open") -Reported-by: Liam Shepherd -Signed-off-by: Ross Lagerwall -Reviewed-by: Juergen Gross -Signed-off-by: David S. Miller ---- - drivers/net/xen-netfront.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c -index 244095bfd604..1d5082d30187 100644 ---- a/drivers/net/xen-netfront.c -+++ b/drivers/net/xen-netfront.c -@@ -1951,10 +1951,6 @@ static int xennet_connect(struct net_device *dev) - /* talk_to_netback() sets the correct number of queues */ - num_queues = dev->real_num_tx_queues; - -- rtnl_lock(); -- netdev_update_features(dev); -- rtnl_unlock(); -- - if (dev->reg_state == NETREG_UNINITIALIZED) { - err = register_netdev(dev); - if (err) { -@@ -1964,6 +1960,10 @@ static int xennet_connect(struct net_device *dev) - } - } - -+ rtnl_lock(); -+ netdev_update_features(dev); -+ rtnl_unlock(); -+ - /* - * All public and private state should now be sane. Get - * ready to start sending and receiving packets and give the driver --- -2.17.1 -