diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-gce-20180823-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-gce-20180823-r2 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-gce-20180823-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-gce-20180823-r2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.70 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.71 similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.70 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.71 index 53d69c4197..dc2da60807 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.70 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.71 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.14.70 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.14.70 +DEPEND==sys-kernel/coreos-modules-4.14.71 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.14.71 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org KEYWORDS=amd64 LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.14.70 +RDEPEND==sys-kernel/coreos-modules-4.14.71 RESTRICT=binchecks strip -SLOT=0/4.14.70 +SLOT=0/4.14.71 _eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72 _md5_=8d9003850e9a0961c3daa40b252ccb37 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.18.8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.18.9 similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.18.8 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.18.9 index d6657ebfad..11819268ed 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.18.8 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.18.9 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.18.8 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.18.8 +DEPEND==sys-kernel/coreos-modules-4.18.9 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.18.9 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org KEYWORDS=amd64 LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.18.8 +RDEPEND==sys-kernel/coreos-modules-4.18.9 RESTRICT=binchecks strip -SLOT=0/4.18.8 +SLOT=0/4.18.9 _eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72 _md5_=8d9003850e9a0961c3daa40b252ccb37 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.70 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.71 similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.70 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.71 index bd264b3565..1f55175be7 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.70 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.71 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.14.70 +DEPEND==sys-kernel/coreos-sources-4.14.71 DESCRIPTION=CoreOS Linux kernel modules EAPI=5 HOMEPAGE=http://www.kernel.org @@ -8,6 +8,6 @@ KEYWORDS=amd64 LICENSE=GPL-2 freedist RDEPEND=!=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf ) RESTRICT=binchecks strip -SLOT=4.14.70 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.70.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz +SLOT=4.14.71 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.71.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz _eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 -_md5_=0e47f18b853c64991dab0fbb47bcabdd +_md5_=785aff8bdcf31c6a6d8916b86044f14f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.18.8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.18.9 similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.18.8 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.18.9 index 665d6149a8..2589861c70 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.18.8 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.18.9 @@ -8,7 +8,7 @@ KEYWORDS=amd64 LICENSE=GPL-2 linux-firmware RDEPEND=sys-devel/bison sys-devel/flex !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf ) RESTRICT=binchecks strip -SLOT=4.18.8 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.8.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz +SLOT=4.18.9 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.9.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz _eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 _md5_=21f68c0a62dfae6f2132e8ff35aed589 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.70.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.71.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.70.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.71.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.18.8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.18.9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.18.8.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.18.9.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.70.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.71.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.70.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.71.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.18.8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.18.9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.18.8.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.18.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 3c8566b94e..1f563077c9 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 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038 -DIST patch-4.14.70.xz 1722428 BLAKE2B 3a24fb97ddbfc182aaa6c5b956c5ef0cfbf3124f7c330e1de6d68ac80e05386627c1fb1a695716486e8b30089d5a17463a406f99b48f1d792a948addd7152d76 SHA512 ef5cd04694863f1cda7b0276aecb94380943770066f21f0a0ae04597da637d86db8b895aae75eb73d3761f524ae3e81196f38711c5e9b9d553a4864d54b58832 -DIST patch-4.18.8.xz 190880 BLAKE2B 7fdff44282a62ef4ca52c8939182f9c1edece17a351442b15801d29f4007b9a260c381a521a68b24d7f0815aba1a5ebc4f3cdf3e6060eee67e48de7151f77390 SHA512 df8e7d24714012fcc6a0532bfd92c2d3ed7651910a5fe7b136bfac0394414690c7617d4e7114113d539fbe53d3375f55840af652f739eb685577458f766d5c03 +DIST patch-4.14.71.xz 1755512 BLAKE2B df4194c2540ebfd7ef39045c7af03e2211e42dd0efcc47cf09b852c1a042960ecf339e17ecf0424dae3be1601a3787b81aded5edad0b4c85077d7468a8ad2788 SHA512 2c3a330a25c6f563a6a5c4462d2c43b3184bd7c1fe619d2166d7cb46157f7e8a17105116449d7a695f63242fa9ce48037681e5980e93dcc7dac2b94e0a42f34d +DIST patch-4.18.9.xz 230916 BLAKE2B 839100aec7129409bb00434e52c8acae863e61edaee4c46bf770374c089eb2a9914acedec70a9bede533784513c32149206b4f767be07cd4ba42b93ccb3a308b SHA512 1ef82764f93a96e759a1b969ce965c0981f86a5d6e2376e7f637209ea1114ce2636bb41971e616973ce8a55692999086f75e465dd96deb77876e9a2fd6ceddc4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.70.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.71.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.70.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.71.ebuild index dc1115d772..29a00207e7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.70.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.71.ebuild @@ -35,5 +35,4 @@ UNIPATCH_LIST=" ${PATCH_DIR}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ ${PATCH_DIR}/z0003-xen-netfront-Fix-mismatched-rtnl_unlock.patch \ ${PATCH_DIR}/z0004-xen-netfront-Update-features-after-registering-netde.patch \ - ${PATCH_DIR}/z0005-Revert-net-increase-fragment-memory-usage-limits.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.18.8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.18.9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.18.8.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.18.9.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/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.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index 1547e54874..f73f7dadd6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/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.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,7 +1,7 @@ -From 55e199251423399d374f987dcadd603532883c0b Mon Sep 17 00:00:00 2001 +From 9776b344e15a0614360a3cda647b84e9a963b007 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/5] 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 aa458afa7fa2..8da3221d88b1 100644 +index dd4eaeeb2050..80a5a9e0f03c 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.14/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 09da1d2dc6..3f4ff649f5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,7 +1,7 @@ -From e46698ff6efc53445242b9dd9bbb0e2ecb5aacea Mon Sep 17 00:00:00 2001 +From 87fe0e22f6ba5cfecdb9fda4c17c8ebcdd31355d Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 -Subject: [PATCH 2/5] tools/objtool/Makefile: Don't fail on fallthrough with +Subject: [PATCH 2/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.14/z0003-xen-netfront-Fix-mismatched-rtnl_unlock.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-xen-netfront-Fix-mismatched-rtnl_unlock.patch index 0088756529..ec9ffd6c09 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-xen-netfront-Fix-mismatched-rtnl_unlock.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-xen-netfront-Fix-mismatched-rtnl_unlock.patch @@ -1,7 +1,7 @@ -From 0cc00462e589c2f6f096d1766834f755849b78b1 Mon Sep 17 00:00:00 2001 +From 26cbc9599e1c002071ed12fdb937ead86a8a49b3 Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Thu, 21 Jun 2018 14:00:20 +0100 -Subject: [PATCH 3/5] xen-netfront: Fix mismatched rtnl_unlock +Subject: [PATCH 3/4] xen-netfront: Fix mismatched rtnl_unlock Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open") Reported-by: Ben Hutchings diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Update-features-after-registering-netde.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Update-features-after-registering-netde.patch index 06c0663395..828c9679fd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Update-features-after-registering-netde.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Update-features-after-registering-netde.patch @@ -1,7 +1,7 @@ -From 0323fd8c5623fbfb869d9c8aa09ba0847e4a1e86 Mon Sep 17 00:00:00 2001 +From cd43fe5ac9411608f0db670fd07c89037b3eae56 Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Thu, 21 Jun 2018 14:00:21 +0100 -Subject: [PATCH 4/5] xen-netfront: Update features after registering netdev +Subject: [PATCH 4/4] 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 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-Revert-net-increase-fragment-memory-usage-limits.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-Revert-net-increase-fragment-memory-usage-limits.patch deleted file mode 100644 index 0cdbb0d9df..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-Revert-net-increase-fragment-memory-usage-limits.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 38032327e85404a4a9e4515bc878a5c76a2d9e9c Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Wed, 15 Aug 2018 12:43:38 -0400 -Subject: [PATCH 5/5] Revert "net: increase fragment memory usage limits" - -This reverts commit c2a936600f78aea00d3312ea4b66a79a4619f9b4. ---- - include/net/ipv6.h | 4 ++-- - net/ipv4/ip_fragment.c | 22 +++++++--------------- - 2 files changed, 9 insertions(+), 17 deletions(-) - -diff --git a/include/net/ipv6.h b/include/net/ipv6.h -index f280c61e019a..bd6f26ae53f1 100644 ---- a/include/net/ipv6.h -+++ b/include/net/ipv6.h -@@ -338,8 +338,8 @@ static inline int ip6_frag_mem(struct net *net) - } - #endif - --#define IPV6_FRAG_HIGH_THRESH (4 * 1024*1024) /* 4194304 */ --#define IPV6_FRAG_LOW_THRESH (3 * 1024*1024) /* 3145728 */ -+#define IPV6_FRAG_HIGH_THRESH (256 * 1024) /* 262144 */ -+#define IPV6_FRAG_LOW_THRESH (192 * 1024) /* 196608 */ - #define IPV6_FRAG_TIMEOUT (60 * HZ) /* 60 seconds */ - - int __ipv6_addr_type(const struct in6_addr *addr); -diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c -index 4cb1befc3949..a90461dcf170 100644 ---- a/net/ipv4/ip_fragment.c -+++ b/net/ipv4/ip_fragment.c -@@ -850,22 +850,14 @@ static void __init ip4_frags_ctl_register(void) - - static int __net_init ipv4_frags_init_net(struct net *net) - { -- /* Fragment cache limits. -- * -- * The fragment memory accounting code, (tries to) account for -- * the real memory usage, by measuring both the size of frag -- * queue struct (inet_frag_queue (ipv4:ipq/ipv6:frag_queue)) -- * and the SKB's truesize. -- * -- * A 64K fragment consumes 129736 bytes (44*2944)+200 -- * (1500 truesize == 2944, sizeof(struct ipq) == 200) -- * -- * We will commit 4MB at one time. Should we cross that limit -- * we will prune down to 3MB, making room for approx 8 big 64K -- * fragments 8x128k. -+ /* -+ * Fragment cache limits. We will commit 256K at one time. Should we -+ * cross that limit we will prune down to 192K. This should cope with -+ * even the most extreme cases without allowing an attacker to -+ * measurably harm machine performance. - */ -- net->ipv4.frags.high_thresh = 4 * 1024 * 1024; -- net->ipv4.frags.low_thresh = 3 * 1024 * 1024; -+ net->ipv4.frags.high_thresh = 256 * 1024; -+ net->ipv4.frags.low_thresh = 192 * 1024; - /* - * Important NOTE! Fragment queue must be destroyed before MSL expires. - * RFC791 is wrong proposing to prolongate timer each fragment arrival --- -2.17.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/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.18/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index a9f4b77262..952d884e5b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/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.18/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,4 +1,4 @@ -From 40da469cd785ce76d16bc5b4e4fe355f10dcc51c Mon Sep 17 00:00:00 2001 +From 3b1cc5069f3536737e38959640ae2f9bb9b74b6f Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 Subject: [PATCH 1/4] kbuild: derive relative path for KBUILD_SRC from CURDIR @@ -12,7 +12,7 @@ by some undesirable path component. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 0d73431f66cd..5ca77426c09e 100644 +index 1178348fb9ca..fc04daaa5287 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.18/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index b9c7480e48..b13126ebbb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,4 +1,4 @@ -From a3be9fe342371638637429780c14c37807d49200 Mon Sep 17 00:00:00 2001 +From 7145eaa544c3fed86505ec54182b3d85c7b68202 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 Subject: [PATCH 2/4] tools/objtool/Makefile: Don't fail on fallthrough with diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0003-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.18/z0003-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch index 08426bfc6f..e706eaccd4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0003-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.18/z0003-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch @@ -1,4 +1,4 @@ -From cd817029d1c17d9a5d66d7b8affd2ae882409754 Mon Sep 17 00:00:00 2001 +From 1ae29aef5b3e14d3d2e90218193d846608f3efe0 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Wed, 4 Jul 2018 18:08:57 +0300 Subject: [PATCH 3/4] 4.17.x won't boot due to "x86/boot/compressed/64: Handle diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0004-Revert-net-increase-fragment-memory-usage-limits.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0004-Revert-net-increase-fragment-memory-usage-limits.patch index 4b6c4d13f8..5d21860aae 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0004-Revert-net-increase-fragment-memory-usage-limits.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.18/z0004-Revert-net-increase-fragment-memory-usage-limits.patch @@ -1,4 +1,4 @@ -From 50d3969af8741f5cf332a0a618d8771b68ee0c58 Mon Sep 17 00:00:00 2001 +From 16bdc341b3220665a3383f71f099a4350e24b161 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 15 Aug 2018 12:50:10 -0400 Subject: [PATCH 4/4] Revert "net: increase fragment memory usage limits"