diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.2.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 727ebbf119..c8d86f0d2a 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-4.14.tar.xz 100770500 SHA256 f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 WHIRLPOOL fee10d54ecb210156aa55364ecc15867127819e9f7ff9ec5f6ef159b1013e2ae3d3a28d35c62d663886cbe826b996a1387671766093be002536309045a8e4d10 -DIST patch-4.14.1.xz 12164 SHA256 5af72b487fbcc8e7fd3f5392271490c8498ffb2048e77abaf406971a7382f8d7 SHA512 2566d2151cb0e0ad706dda3cb815e293d84ecc804cf2891e511a0f28e359b7714a1732add599a268c98108a63ee40200cf76cbda8181d67d0a64511e815202df WHIRLPOOL 2732015a7535ca3fbcf663159cf8a43c5d6cf1092e969448240e05540995e064572b7bdce9c8d9cac561c20209d24c0acb131e99143b3c1473cfe724e414cc1f +DIST patch-4.14.2.xz 18004 SHA256 2dc86272e55d31c55bdeaa47b3d44fbd6235a396e37d82c2b47aa27f6ba82ee3 SHA512 04415954c3c4d3044a6a3da979e59fb18f0eda3fd872a8036ac8947fbbadcd6041384a900973b917353de6e5c1a589eff1db63c029edcb78f38b07868a929f9d WHIRLPOOL cc730d3716c6a183df0d1fe0efcb3c4a81f8d8e8c98c9bb117f14c3f19840973779888c85733ae032e65f9131cf8b83ff86e8ca4caa4744d9eda2980e4f8b531 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.2.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.2.ebuild index 00ae676774..a6745b7129 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.2.ebuild @@ -33,5 +33,4 @@ IUSE="" 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-bio-ensure-__bio_clone_fast-copies-bi_partno.patch \ " 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 047b2cf071..1f9755f13f 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 23687fb2608d51e522d107923493696174df2f03 Mon Sep 17 00:00:00 2001 +From 1a89d205e59f3d0ea802bf6404a96b7ced202104 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/3] kbuild: derive relative path for KBUILD_SRC from CURDIR +Subject: [PATCH 1/2] 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 01f9df1af256..ed0c499bf87d 100644 +index 75d89dc2b94a..876a82e27496 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-Add-arm64-coreos-verity-hash.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch index e8eb89253d..2ed1748716 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch @@ -1,7 +1,7 @@ -From ac9f815d8e102992e1671b2bed872e585e1561d3 Mon Sep 17 00:00:00 2001 +From 14ec88348dbc9ed280aa4f6a85c4bdd37d80ed14 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 11 Nov 2016 17:28:52 -0800 -Subject: [PATCH 2/3] Add arm64 coreos verity hash +Subject: [PATCH 2/2] 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.14/z0003-bio-ensure-__bio_clone_fast-copies-bi_partno.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-bio-ensure-__bio_clone_fast-copies-bi_partno.patch deleted file mode 100644 index c3f319fc89..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-bio-ensure-__bio_clone_fast-copies-bi_partno.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ce20c57675d3251f2ea2d77fab7cd3f3f24c52b4 Mon Sep 17 00:00:00 2001 -From: Michael Lyle -Date: Thu, 16 Nov 2017 23:47:25 -0800 -Subject: [PATCH 3/3] bio: ensure __bio_clone_fast copies bi_partno - -A new field was introduced in 74d46992e0d9, bi_partno, instead of using -bdev->bd_contains and encoding the partition information in the bi_bdev -field. __bio_clone_fast was changed to copy the disk information, but -not the partition information. At minimum, this regressed bcache and -caused data corruption. - -Signed-off-by: Michael Lyle -Fixes: 74d46992e0d9 ("block: replace bi_bdev with a gendisk pointer and partitions index") -Reported-by: Pavel Goran -Reported-by: Campbell Steven -Reviewed-by: Coly Li -Reviewed-by: Ming Lei -Cc: # 4.14 -Signed-off-by: Jens Axboe ---- - block/bio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/block/bio.c b/block/bio.c -index 101c2a9b5481..33fa6b4af312 100644 ---- a/block/bio.c -+++ b/block/bio.c -@@ -597,6 +597,7 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src) - * so we don't set nor calculate new physical/hw segment counts here - */ - bio->bi_disk = bio_src->bi_disk; -+ bio->bi_partno = bio_src->bi_partno; - bio_set_flag(bio, BIO_CLONED); - bio->bi_opf = bio_src->bi_opf; - bio->bi_write_hint = bio_src->bi_write_hint; --- -2.14.1 -