Merge pull request #3326 from dm0-/linux

Bump Linux 4.14.54 to 4.15.55 and 4.17.5 to 4.17.6

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.11.0

@@ -10,4 +10,4 @@ RDEPEND=>=net-dns/dnsmasq-2.72[dhcp,ipv6]
 REQUIRED_USE=go_version_go1_10
 SLOT=0
 _eclasses_=coreos-go	43a394c18570b3dd8dd6e74fc9853493	coreos-go-depend	0c1747ddda8ae24e0d2e88cdfddaa7d1	coreos-go-utils	c34072f13165bb85e5106cc6e082a4e1	cros-workon	4ad6e6491a1010ad7c875302b3be18ba	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cdc7646a74e63169eb7298fac51e21c
+_md5_=623d34609e441ac0a38915035797ad8d

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999

@@ -10,4 +10,4 @@ RDEPEND=>=net-dns/dnsmasq-2.72[dhcp,ipv6]
 REQUIRED_USE=go_version_go1_10
 SLOT=0
 _eclasses_=coreos-go	43a394c18570b3dd8dd6e74fc9853493	coreos-go-depend	0c1747ddda8ae24e0d2e88cdfddaa7d1	coreos-go-utils	c34072f13165bb85e5106cc6e082a4e1	cros-workon	4ad6e6491a1010ad7c875302b3be18ba	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cdc7646a74e63169eb7298fac51e21c
+_md5_=623d34609e441ac0a38915035797ad8d

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/intel-microcode-20180703

@@ -2,13 +2,13 @@ DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
 DEPEND=sys-apps/iucode_tool
 DESCRIPTION=Intel IA32/IA64 microcode update data
 EAPI=6
-HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=27776
+HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=27945
 IUSE=hostonly initramfs +split-ucode vanilla
 KEYWORDS=-* amd64 x86
 LICENSE=intel-ucode
 RDEPEND=!<sys-apps/microcode-ctl-1.17-r2 hostonly? ( sys-apps/iucode_tool )
 REQUIRED_USE=|| ( initramfs split-ucode )
-SLOT=0/20180616
+SLOT=0/20180703
-SRC_URI=https://downloadmirror.intel.com/27776/eng/microcode-20180425.tgz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20180616.tar.xz
+SRC_URI=https://downloadmirror.intel.com/27945/eng/microcode-20180703.tgz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20180630.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a3629cbf795e0e0eddbeebcbb0564f23
+_md5_=d4ddcbc6b3826a49e1f1e698c38758a9

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.55

@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-modules-4.14.54 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.54
+DEPEND==sys-kernel/coreos-modules-4.14.55 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.55
 DESCRIPTION=CoreOS Linux kernel
 EAPI=5
 HOMEPAGE=http://www.kernel.org
 KEYWORDS=amd64 arm64
 LICENSE=GPL-2 freedist
-RDEPEND==sys-kernel/coreos-modules-4.14.54
+RDEPEND==sys-kernel/coreos-modules-4.14.55
 RESTRICT=binchecks strip
-SLOT=0/4.14.54
+SLOT=0/4.14.55
 _eclasses_=coreos-kernel	e8feb48b1a123c62c678f86fd8ac3067	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=b06e416b987a33bf039f3788ebb4a943

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.6

@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-modules-4.17.5 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.17.5
+DEPEND==sys-kernel/coreos-modules-4.17.6 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.17.6
 DESCRIPTION=CoreOS Linux kernel
 EAPI=5
 HOMEPAGE=http://www.kernel.org
 KEYWORDS=amd64 arm64
 LICENSE=GPL-2 freedist
-RDEPEND==sys-kernel/coreos-modules-4.17.5
+RDEPEND==sys-kernel/coreos-modules-4.17.6
 RESTRICT=binchecks strip
-SLOT=0/4.17.5
+SLOT=0/4.17.6
 _eclasses_=coreos-kernel	e8feb48b1a123c62c678f86fd8ac3067	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=b06e416b987a33bf039f3788ebb4a943

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.55

@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-sources-4.14.54
+DEPEND==sys-kernel/coreos-sources-4.14.55
 DESCRIPTION=CoreOS Linux kernel modules
 EAPI=5
 HOMEPAGE=http://www.kernel.org
@@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64
 LICENSE=GPL-2 freedist
 RDEPEND=!<sys-kernel/coreos-kernel-4.6.3-r1
 RESTRICT=binchecks strip
-SLOT=0/4.14.54
+SLOT=0/4.14.55
 _eclasses_=coreos-kernel	e8feb48b1a123c62c678f86fd8ac3067	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a88b250c5a7da995b47b632b9f99b8dd

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.6

@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-sources-4.17.5
+DEPEND==sys-kernel/coreos-sources-4.17.6
 DESCRIPTION=CoreOS Linux kernel modules
 EAPI=5
 HOMEPAGE=http://www.kernel.org
@@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64
 LICENSE=GPL-2 freedist
 RDEPEND=!<sys-kernel/coreos-kernel-4.6.3-r1
 RESTRICT=binchecks strip
-SLOT=0/4.17.5
+SLOT=0/4.17.6
 _eclasses_=coreos-kernel	e8feb48b1a123c62c678f86fd8ac3067	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a88b250c5a7da995b47b632b9f99b8dd

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.14.55

@@ -8,7 +8,7 @@ KEYWORDS=amd64 arm64
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.14.54
+SLOT=4.14.55
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.54.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.55.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_=d04ff0ae4b5bc566db21302d0dea48f4
+_md5_=854d8911063dad798e6a5dc591a9a14e

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.17.6

@@ -8,7 +8,7 @@ KEYWORDS=amd64 arm64
 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.17.5
+SLOT=4.17.6
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.6.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.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_=27e74eeaa05ef3eb4137e8c08ab9713d
+_md5_=f2b0bae7c4beca62bec04b6135f3501b

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.54.xz 1431256 SHA256 4e2b1ba719ccced76ff8b2f9854352cef2be7d719cd19004278fa3d88b4ff345 SHA512 9a10b551c80c3670221e803e40f6bec70ca09a95bead328bd390d2d029abcdb216334d5178c54d0128e8cd6e4ae197ccb2c053d7c643c5665f04afa56857f03c WHIRLPOOL c2215b8d436a4d2d945221944f88b0bc7ef5d702066ab8d84cb8c9d6de590263fdb2f8397b6af3f97239ff8388252415d2676a44bff4c4ba1df75b671521491c
+DIST patch-4.14.55.xz 1444204 SHA256 55b5c57492fd07ea2087d570a5d85c62ec58e1887cdc29396a0274a9095e3fd7 SHA512 9801d5f197ca3db39f43abe2a8540d9bec92d19f31accc8017c9d0226d889b3da8765cde3268dab7cd1097cfd804d42482e5343f9429926fcbd9a867a038f766 WHIRLPOOL 95961f21d913d6415d4a494084acda177716ffef07204e58a9fa15dc5c3922c4b90aa302245d99cf580a43a56c13189f4d8a3875a389900267378760f79387a5
-DIST patch-4.17.5.xz 121080 SHA256 cc18fcf14df25f0bab047aa180b9362bd4f3ce96f1b05e1f7764cfcc0e271bbd SHA512 2623f82b4664b5ef6af4f1f9e2758661d7c3b4b7445990fb22b1a93d33006316a7a19c03d7dfccb0c49c7cfc2791c4b0aa6c543730ffc1d095c72402f060dd5c WHIRLPOOL c3204e719418afa7da539921667e2ee3552986406e195c82acf26b086f8f5d1155e05a3e5240a9ebba711e7c37a8531d2d6898a9d1feea96f572015f07a479af
+DIST patch-4.17.6.xz 138580 SHA256 7699b2246e4ed1e284f2947d5e0b66653c27574995caf6a02a3280bd055cfedf SHA512 4b791d94db704cbbe3dbf6b340735fe7999957741f116ca14060ced836aece1d4b51d0c3f376af1564e7379fbb9c9132a8e4d021fc74599f3ab037237d718651 WHIRLPOOL 81dbb7899c75150bd6bc16ca0c6ba8e1d1ee441fb5a2edf7175bb3e1220e279304334252b5de2a6abd0f3ad5b6c4c33dce7f274888988c28b2d31fb2d98724ff

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.55.ebuild

@@ -33,9 +33,7 @@ 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-block-factor-out-__blkdev_issue_zero_pages.patch \
+	${PATCH_DIR}/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
-	${PATCH_DIR}/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch \
+	${PATCH_DIR}/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch \
-	${PATCH_DIR}/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
+	${PATCH_DIR}/z0005-xen-netfront-Update-features-after-registering-netde.patch \
-	${PATCH_DIR}/z0006-xen-netfront-Fix-mismatched-rtnl_unlock.patch \
-	${PATCH_DIR}/z0007-xen-netfront-Update-features-after-registering-netde.patch \
 "

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.17.6.ebuild

@@ -40,5 +40,5 @@ UNIPATCH_LIST="
 	${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-Revert-x86-boot-compressed-64-Handle-5-level-paging-.patch \
+	${PATCH_DIR}/z0006-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch \
 "

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 d98e489fc3a08b0e60e19150c5d72c94207931c0 Mon Sep 17 00:00:00 2001
+From b6aa461d81c47dfea0f86c4d5884beb792b383a0 Mon Sep 17 00:00:00 2001
 From: Vito Caputo <vito.caputo@coreos.com>
 Date: Wed, 25 Nov 2015 02:59:45 -0800
-Subject: [PATCH 1/7] kbuild: derive relative path for KBUILD_SRC from CURDIR
+Subject: [PATCH 1/5] 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 de0955d8dfa3..402430c92f71 100644
+index 0700feaaa6cf..77c827831507 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
@@ -26,5 +26,5 @@ index de0955d8dfa3..402430c92f71 100644
  
  # Leave processing to above invocation of make
 -- 
-2.14.4
+2.17.1
 

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 541ba5ec5f1afa4b9de869f43649354167357510 Mon Sep 17 00:00:00 2001
+From 8416083519a4e781281e10ef202e3f2b589bb766 Mon Sep 17 00:00:00 2001
 From: Geoff Levand <geoff@infradead.org>
 Date: Fri, 11 Nov 2016 17:28:52 -0800
-Subject: [PATCH 2/7] Add arm64 coreos verity hash
+Subject: [PATCH 2/5] Add arm64 coreos verity hash
 
 Signed-off-by: Geoff Levand <geoff@infradead.org>
 ---
@@ -25,5 +25,5 @@ index 613fc3000677..fdaf86c78332 100644
  	/*
  	 * The debug table is referenced via its Relative Virtual Address (RVA),
 -- 
-2.14.4
+2.17.1
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch

@@ -1,107 +0,0 @@
-From 61bf1629dc96063f2638ea9604a31e48348d6944 Mon Sep 17 00:00:00 2001
-From: Ilya Dryomov <idryomov@gmail.com>
-Date: Mon, 16 Oct 2017 15:59:09 +0200
-Subject: [PATCH 3/7] block: factor out __blkdev_issue_zero_pages()
-
-blkdev_issue_zeroout() will use this in !BLKDEV_ZERO_NOFALLBACK case.
-
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
----
- block/blk-lib.c | 63 +++++++++++++++++++++++++++++++++------------------------
- 1 file changed, 37 insertions(+), 26 deletions(-)
-
-diff --git a/block/blk-lib.c b/block/blk-lib.c
-index 63fb971d6574..9e86a4871b0f 100644
---- a/block/blk-lib.c
-+++ b/block/blk-lib.c
-@@ -275,6 +275,40 @@ static unsigned int __blkdev_sectors_to_bio_pages(sector_t nr_sects)
- 	return min(pages, (sector_t)BIO_MAX_PAGES);
- }
- 
-+static int __blkdev_issue_zero_pages(struct block_device *bdev,
-+		sector_t sector, sector_t nr_sects, gfp_t gfp_mask,
-+		struct bio **biop)
-+{
-+	struct request_queue *q = bdev_get_queue(bdev);
-+	struct bio *bio = *biop;
-+	int bi_size = 0;
-+	unsigned int sz;
-+
-+	if (!q)
-+		return -ENXIO;
-+
-+	while (nr_sects != 0) {
-+		bio = next_bio(bio, __blkdev_sectors_to_bio_pages(nr_sects),
-+			       gfp_mask);
-+		bio->bi_iter.bi_sector = sector;
-+		bio_set_dev(bio, bdev);
-+		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
-+
-+		while (nr_sects != 0) {
-+			sz = min((sector_t) PAGE_SIZE, nr_sects << 9);
-+			bi_size = bio_add_page(bio, ZERO_PAGE(0), sz, 0);
-+			nr_sects -= bi_size >> 9;
-+			sector += bi_size >> 9;
-+			if (bi_size < sz)
-+				break;
-+		}
-+		cond_resched();
-+	}
-+
-+	*biop = bio;
-+	return 0;
-+}
-+
- /**
-  * __blkdev_issue_zeroout - generate number of zero filed write bios
-  * @bdev:	blockdev to issue
-@@ -305,9 +339,6 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
- 		unsigned flags)
- {
- 	int ret;
--	int bi_size = 0;
--	struct bio *bio = *biop;
--	unsigned int sz;
- 	sector_t bs_mask;
- 
- 	bs_mask = (bdev_logical_block_size(bdev) >> 9) - 1;
-@@ -317,30 +348,10 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
- 	ret = __blkdev_issue_write_zeroes(bdev, sector, nr_sects, gfp_mask,
- 			biop, flags);
- 	if (ret != -EOPNOTSUPP || (flags & BLKDEV_ZERO_NOFALLBACK))
--		goto out;
--
--	ret = 0;
--	while (nr_sects != 0) {
--		bio = next_bio(bio, __blkdev_sectors_to_bio_pages(nr_sects),
--			       gfp_mask);
--		bio->bi_iter.bi_sector = sector;
--		bio_set_dev(bio, bdev);
--		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
--
--		while (nr_sects != 0) {
--			sz = min((sector_t) PAGE_SIZE, nr_sects << 9);
--			bi_size = bio_add_page(bio, ZERO_PAGE(0), sz, 0);
--			nr_sects -= bi_size >> 9;
--			sector += bi_size >> 9;
--			if (bi_size < sz)
--				break;
--		}
--		cond_resched();
--	}
-+		return ret;
- 
--	*biop = bio;
--out:
--	return ret;
-+	return __blkdev_issue_zero_pages(bdev, sector, nr_sects, gfp_mask,
-+					 biop);
- }
- EXPORT_SYMBOL(__blkdev_issue_zeroout);
- 
--- 
-2.14.4
-

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch

@@ -1,7 +1,7 @@
-From d0d7ef751f12bb18b79f53d4ee720ad10013188f Mon Sep 17 00:00:00 2001
+From a6b45438c13f16085fa9bd844a460b6e6718ac34 Mon Sep 17 00:00:00 2001
 From: David Michael <david.michael@coreos.com>
 Date: Thu, 8 Feb 2018 21:23:12 -0500
-Subject: [PATCH 5/7] tools/objtool/Makefile: Don't fail on fallthrough with
+Subject: [PATCH 3/5] tools/objtool/Makefile: Don't fail on fallthrough with
  new GCCs
 
 ---
@@ -23,5 +23,5 @@ index 95563b8e1ad7..307652c42a7b 100644
  
  CFLAGS += -I$(srctree)/tools/include/
 -- 
-2.14.4
+2.17.1
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch

@@ -1,110 +0,0 @@
-From 47e0538b031f2360cade55c566c3849c409f4bd9 Mon Sep 17 00:00:00 2001
-From: Ilya Dryomov <idryomov@gmail.com>
-Date: Mon, 16 Oct 2017 15:59:10 +0200
-Subject: [PATCH 4/7] block: cope with WRITE ZEROES failing in
- blkdev_issue_zeroout()
-
-sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to
-permit trying WRITE SAME on older SCSI devices, unless ->no_write_same
-is set.  Because REQ_OP_WRITE_ZEROES is implemented in terms of WRITE
-SAME, blkdev_issue_zeroout() may fail with -EREMOTEIO:
-
-  $ fallocate -zn -l 1k /dev/sdg
-  fallocate: fallocate failed: Remote I/O error
-  $ fallocate -zn -l 1k /dev/sdg  # OK
-  $ fallocate -zn -l 1k /dev/sdg  # OK
-
-The following calls succeed because sd_done() sets ->no_write_same in
-response to a sense that would become BLK_STS_TARGET/-EREMOTEIO, causing
-__blkdev_issue_zeroout() to fall back to generating ZERO_PAGE bios.
-
-This means blkdev_issue_zeroout() must cope with WRITE ZEROES failing
-and fall back to manually zeroing, unless BLKDEV_ZERO_NOFALLBACK is
-specified.  For BLKDEV_ZERO_NOFALLBACK case, return -EOPNOTSUPP if
-sd_done() has just set ->no_write_same thus indicating lack of offload
-support.
-
-Fixes: c20cfc27a473 ("block: stop using blkdev_issue_write_same for zeroing")
-Cc: Hannes Reinecke <hare@suse.com>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
----
- block/blk-lib.c | 45 +++++++++++++++++++++++++++++++++++----------
- 1 file changed, 35 insertions(+), 10 deletions(-)
-
-diff --git a/block/blk-lib.c b/block/blk-lib.c
-index 9e86a4871b0f..2bc544ce3d2e 100644
---- a/block/blk-lib.c
-+++ b/block/blk-lib.c
-@@ -322,12 +322,6 @@ static int __blkdev_issue_zero_pages(struct block_device *bdev,
-  *  Zero-fill a block range, either using hardware offload or by explicitly
-  *  writing zeroes to the device.
-  *
-- *  Note that this function may fail with -EOPNOTSUPP if the driver signals
-- *  zeroing offload support, but the device fails to process the command (for
-- *  some devices there is no non-destructive way to verify whether this
-- *  operation is actually supported).  In this case the caller should call
-- *  retry the call to blkdev_issue_zeroout() and the fallback path will be used.
-- *
-  *  If a device is using logical block provisioning, the underlying space will
-  *  not be released if %flags contains BLKDEV_ZERO_NOUNMAP.
-  *
-@@ -371,18 +365,49 @@ EXPORT_SYMBOL(__blkdev_issue_zeroout);
- int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
- 		sector_t nr_sects, gfp_t gfp_mask, unsigned flags)
- {
--	int ret;
--	struct bio *bio = NULL;
-+	int ret = 0;
-+	sector_t bs_mask;
-+	struct bio *bio;
- 	struct blk_plug plug;
-+	bool try_write_zeroes = !!bdev_write_zeroes_sectors(bdev);
- 
-+	bs_mask = (bdev_logical_block_size(bdev) >> 9) - 1;
-+	if ((sector | nr_sects) & bs_mask)
-+		return -EINVAL;
-+
-+retry:
-+	bio = NULL;
- 	blk_start_plug(&plug);
--	ret = __blkdev_issue_zeroout(bdev, sector, nr_sects, gfp_mask,
--			&bio, flags);
-+	if (try_write_zeroes) {
-+		ret = __blkdev_issue_write_zeroes(bdev, sector, nr_sects,
-+						  gfp_mask, &bio, flags);
-+	} else if (!(flags & BLKDEV_ZERO_NOFALLBACK)) {
-+		ret = __blkdev_issue_zero_pages(bdev, sector, nr_sects,
-+						gfp_mask, &bio);
-+	} else {
-+		/* No zeroing offload support */
-+		ret = -EOPNOTSUPP;
-+	}
- 	if (ret == 0 && bio) {
- 		ret = submit_bio_wait(bio);
- 		bio_put(bio);
- 	}
- 	blk_finish_plug(&plug);
-+	if (ret && try_write_zeroes) {
-+		if (!(flags & BLKDEV_ZERO_NOFALLBACK)) {
-+			try_write_zeroes = false;
-+			goto retry;
-+		}
-+		if (!bdev_write_zeroes_sectors(bdev)) {
-+			/*
-+			 * Zeroing offload support was indicated, but the
-+			 * device reported ILLEGAL REQUEST (for some devices
-+			 * there is no non-destructive way to verify whether
-+			 * WRITE ZEROES is actually supported).
-+			 */
-+			ret = -EOPNOTSUPP;
-+		}
-+	}
- 
- 	return ret;
- }
--- 
-2.14.4
-

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch

@@ -1,7 +1,7 @@
-From 0ff5140c443d30a1936f3b3e3cdc53e4032b73df Mon Sep 17 00:00:00 2001
+From 8675a0641d86e68c0a7ed71eb5c476b451407de4 Mon Sep 17 00:00:00 2001
 From: Ross Lagerwall <ross.lagerwall@citrix.com>
 Date: Thu, 21 Jun 2018 14:00:20 +0100
-Subject: [PATCH 6/7] xen-netfront: Fix mismatched rtnl_unlock
+Subject: [PATCH 4/5] xen-netfront: Fix mismatched rtnl_unlock
 
 Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open")
 Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
@@ -34,5 +34,5 @@ index f07b9c9bb5ba..95514b1ac0ae 100644
  	return err;
  }
 -- 
-2.14.4
+2.17.1
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-xen-netfront-Update-features-after-registering-netde.patch

@@ -1,7 +1,7 @@
-From d2079055f3130b7ca42fe2f903200942fafccbe2 Mon Sep 17 00:00:00 2001
+From 13373f9cee437b2181e514084b82380cc4c3afe1 Mon Sep 17 00:00:00 2001
 From: Ross Lagerwall <ross.lagerwall@citrix.com>
 Date: Thu, 21 Jun 2018 14:00:21 +0100
-Subject: [PATCH 7/7] xen-netfront: Update features after registering netdev
+Subject: [PATCH 5/5] 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
@@ -45,5 +45,5 @@ index 95514b1ac0ae..238744ebe9e0 100644
  	 * All public and private state should now be sane.  Get
  	 * ready to start sending and receiving packets and give the driver
 -- 
-2.14.4
+2.17.1
 

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,4 +1,4 @@
-From 0c3103a6f47796394e400d8f4d5f8ca0cdd0851c Mon Sep 17 00:00:00 2001
+From e45b47baa01835164367387a75a1e18a1f22b9f3 Mon Sep 17 00:00:00 2001
 From: Vito Caputo <vito.caputo@coreos.com>
 Date: Wed, 25 Nov 2015 02:59:45 -0800
 Subject: [PATCH 1/6] 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 e4ddbad49636..0444b7ac844b 100644
+index 1a885c8f82ef..a9549cda93fb 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
@@ -26,5 +26,5 @@ index e4ddbad49636..0444b7ac844b 100644
  
  # Leave processing to above invocation of make
 -- 
-2.14.4
+2.17.1
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0002-Add-arm64-coreos-verity-hash.patch

@@ -1,4 +1,4 @@
-From e8e6f7ecf0e3e62573730265b05928d4ea250062 Mon Sep 17 00:00:00 2001
+From 004c2ed4bbe430e6d700588c0b43a4d0ec9789bf Mon Sep 17 00:00:00 2001
 From: Geoff Levand <geoff@infradead.org>
 Date: Fri, 11 Nov 2016 17:28:52 -0800
 Subject: [PATCH 2/6] Add arm64 coreos verity hash
@@ -25,5 +25,5 @@ index 613fc3000677..fdaf86c78332 100644
  	/*
  	 * The debug table is referenced via its Relative Virtual Address (RVA),
 -- 
-2.14.4
+2.17.1
 

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,4 +1,4 @@
-From 20e5dbdef3b477c1cd0e8a8d303d56972b0146bc Mon Sep 17 00:00:00 2001
+From 9e799d52e03f0c53012543fd8fe8450617c5c068 Mon Sep 17 00:00:00 2001
 From: David Michael <david.michael@coreos.com>
 Date: Thu, 8 Feb 2018 21:23:12 -0500
 Subject: [PATCH 3/6] tools/objtool/Makefile: Don't fail on fallthrough with
@@ -23,5 +23,5 @@ index 95563b8e1ad7..307652c42a7b 100644
  
  CFLAGS += -I$(srctree)/tools/include/
 -- 
-2.14.4
+2.17.1
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch

@@ -1,4 +1,4 @@
-From 2e4ddc35026d1cbd95b31766626ded7fd26e2f05 Mon Sep 17 00:00:00 2001
+From 076984201d09be7d1629b99a70472afe538d4f51 Mon Sep 17 00:00:00 2001
 From: Ross Lagerwall <ross.lagerwall@citrix.com>
 Date: Thu, 21 Jun 2018 14:00:20 +0100
 Subject: [PATCH 4/6] xen-netfront: Fix mismatched rtnl_unlock
@@ -34,5 +34,5 @@ index 4dd0668003e7..244095bfd604 100644
  	return err;
  }
 -- 
-2.14.4
+2.17.1
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0005-xen-netfront-Update-features-after-registering-netde.patch

@@ -1,4 +1,4 @@
-From 1d2a593355a04f39157c94c72b86cf763455ccf5 Mon Sep 17 00:00:00 2001
+From 27e6afb3bb0190bcdddf5e56c54938da86818908 Mon Sep 17 00:00:00 2001
 From: Ross Lagerwall <ross.lagerwall@citrix.com>
 Date: Thu, 21 Jun 2018 14:00:21 +0100
 Subject: [PATCH 5/6] xen-netfront: Update features after registering netdev
@@ -45,5 +45,5 @@ index 244095bfd604..1d5082d30187 100644
  	 * All public and private state should now be sane.  Get
  	 * ready to start sending and receiving packets and give the driver
 -- 
-2.14.4
+2.17.1
 

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

@@ -0,0 +1,77 @@
+From 05aa6dd51095317744ead6d2c500442b7a1f6905 Mon Sep 17 00:00:00 2001
+From: "Kirill A. Shutemov" <kirill@shutemov.name>
+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
+ 5-level paging boot if kernel is above 4G"
+
+On Tue, Jul 03, 2018 at 05:21:50PM +0300, Kirill A. Shutemov wrote:
+> On Tue, Jul 03, 2018 at 03:44:03PM +0300, Kirill A. Shutemov wrote:
+> > On Tue, Jul 03, 2018 at 01:24:49PM +0200, Gabriel C wrote:
+> > > 2018-07-01 23:32 GMT+02:00 Benjamin Gilbert <bgilbert@redhat.com>:
+> > > > On Sun, Jul 01, 2018 at 05:15:59PM -0400, Benjamin Gilbert wrote:
+> > > >> 4.17 kernels built with the CoreOS Container Linux toolchain and kconfig,
+> > > >> up to and including 4.17.3, fail to boot on AMD64 running in (at least)
+> > > >> QEMU/KVM.  No messages are shown post-GRUB; the VM instantly reboots.
+> > > >> Reverting commit 194a9749c73d ("x86/boot/compressed/64: Handle 5-level
+> > > >> paging boot if kernel is above 4G") fixes it.  I've attached our kernel
+> > > >> config for reference, and am happy to test patches, provide sample QCOW
+> > > >> images, etc.
+> > > >
+> > >
+> > > Also see https://bugzilla.kernel.org/show_bug.cgi?id=200385 ,
+> > >
+> > > 0a1756bd2897951c03c1cb671bdfd40729ac2177 is acting up
+> > > too with the same symptoms
+> >
+> > I tracked it down to -flto in LDFLAGS. I'll look more into this.
+>
+> -flto in LDFLAGS screws up this part of paging_prepare():
+
++Masahiro, Michal.
+
+I've got it wrong. *Any* LDFLAGS option passed to make this way:
+
+  make LDFLAGS="..."
+
+would cause a issue. Even empty.
+
+It overrides all assignments to the variable in the makefile.
+As result the image is built without -pie and linker doesn't generate
+position independed code.
+
+Looks like the patch below helps, but my make-fu is poor.
+I don't see many override directives in kernel makefiles.
+It makes me think that there's a better way to fix this.
+
+Hm?
+---
+ arch/x86/boot/compressed/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
+index fa42f895fdde..4f24baa8cdeb 100644
+--- a/arch/x86/boot/compressed/Makefile
++++ b/arch/x86/boot/compressed/Makefile
+@@ -42,16 +42,16 @@ KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+ UBSAN_SANITIZE :=n
+ 
+-LDFLAGS := -m elf_$(UTS_MACHINE)
++override LDFLAGS := -m elf_$(UTS_MACHINE)
+ # Compressed kernel should be built as PIE since it may be loaded at any
+ # address by the bootloader.
+ ifeq ($(CONFIG_X86_32),y)
+-LDFLAGS += $(call ld-option, -pie) $(call ld-option, --no-dynamic-linker)
++override LDFLAGS += $(call ld-option, -pie) $(call ld-option, --no-dynamic-linker)
+ else
+ # To build 64-bit compressed kernel as PIE, we disable relocation
+ # overflow check to avoid relocation overflow error with a new linker
+ # command-line option, -z noreloc-overflow.
+-LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \
++override LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \
+ 	&& echo "-z noreloc-overflow -pie --no-dynamic-linker")
+ endif
+ LDFLAGS_vmlinux := -T
+-- 
+2.17.1
+

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.17/z0006-Revert-x86-boot-compressed-64-Handle-5-level-paging-.patch

@@ -1,132 +0,0 @@
-From ef3afa473f6d31812979d6f1ed0b553aefa7ca41 Mon Sep 17 00:00:00 2001
-From: Benjamin Gilbert <bgilbert@redhat.com>
-Date: Sun, 1 Jul 2018 12:13:35 -0700
-Subject: [PATCH 6/6] Revert "x86/boot/compressed/64: Handle 5-level paging
- boot if kernel is above 4G"
-
-This reverts commit 194a9749c73d650c0b1dfdee04fb0bdf0a888ba8, which causes
-instantaneous and silent boot failures.
----
- arch/x86/boot/compressed/head_64.S | 69 +++++++++-----------------------------
- 1 file changed, 16 insertions(+), 53 deletions(-)
-
-diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
-index 8169e8b7a4dc..7588e65a9c4a 100644
---- a/arch/x86/boot/compressed/head_64.S
-+++ b/arch/x86/boot/compressed/head_64.S
-@@ -326,27 +326,11 @@ ENTRY(startup_64)
- 
- 	/*
- 	 * At this point we are in long mode with 4-level paging enabled,
--	 * but we might want to enable 5-level paging or vice versa.
-+	 * but we want to enable 5-level paging.
- 	 *
--	 * The problem is that we cannot do it directly. Setting or clearing
--	 * CR4.LA57 in long mode would trigger #GP. So we need to switch off
--	 * long mode and paging first.
--	 *
--	 * We also need a trampoline in lower memory to switch over from
--	 * 4- to 5-level paging for cases when the bootloader puts the kernel
--	 * above 4G, but didn't enable 5-level paging for us.
--	 *
--	 * The same trampoline can be used to switch from 5- to 4-level paging
--	 * mode, like when starting 4-level paging kernel via kexec() when
--	 * original kernel worked in 5-level paging mode.
--	 *
--	 * For the trampoline, we need the top page table to reside in lower
--	 * memory as we don't have a way to load 64-bit values into CR3 in
--	 * 32-bit mode.
--	 *
--	 * We go though the trampoline even if we don't have to: if we're
--	 * already in a desired paging mode. This way the trampoline code gets
--	 * tested on every boot.
-+	 * The problem is that we cannot do it directly. Setting LA57 in
-+	 * long mode would trigger #GP. So we need to switch off long mode
-+	 * first.
- 	 */
- 
- 	/* Make sure we have GDT with 32-bit code segment */
-@@ -371,18 +355,13 @@ ENTRY(startup_64)
- 	/* Save the trampoline address in RCX */
- 	movq	%rax, %rcx
- 
--	/*
--	 * Load the address of trampoline_return() into RDI.
--	 * It will be used by the trampoline to return to the main code.
--	 */
--	leaq	trampoline_return(%rip), %rdi
- 
- 	/* Switch to compatibility mode (CS.L = 0 CS.D = 1) via far return */
- 	pushq	$__KERNEL32_CS
--	leaq	TRAMPOLINE_32BIT_CODE_OFFSET(%rax), %rax
-+	leaq	compatible_mode(%rip), %rax
- 	pushq	%rax
- 	lretq
--trampoline_return:
-+lvl5:
- 	/* Restore the stack, the 32-bit trampoline uses its own stack */
- 	leaq	boot_stack_end(%rbx), %rsp
- 
-@@ -559,14 +538,8 @@ adjust_got:
- 	ret
- 
- 	.code32
--/*
-- * This is the 32-bit trampoline that will be copied over to low memory.
-- *
-- * RDI contains the return address (might be above 4G).
-- * ECX contains the base address of the trampoline memory.
-- * Non zero RDX on return means we need to enable 5-level paging.
-- */
- ENTRY(trampoline_32bit_src)
-+compatible_mode:
- 	/* Set up data and stack segments */
- 	movl	$__KERNEL_DS, %eax
- 	movl	%eax, %ds
-@@ -607,34 +580,24 @@ ENTRY(trampoline_32bit_src)
- 1:
- 	movl	%eax, %cr4
- 
--	/* Calculate address of paging_enabled() once we are executing in the trampoline */
--	leal	paging_enabled - trampoline_32bit_src + TRAMPOLINE_32BIT_CODE_OFFSET(%ecx), %eax
-+	/* Calculate address we are running at */
-+	call	1f
-+1:	popl	%edi
-+	subl	$1b, %edi
- 
--	/* Prepare the stack for far return to Long Mode */
-+	/* Prepare stack for far return to Long Mode */
- 	pushl	$__KERNEL_CS
--	pushl	%eax
-+	leal	lvl5(%edi), %eax
-+	push	%eax
- 
--	/* Enable paging again */
-+	/* Enable paging back */
- 	movl	$(X86_CR0_PG | X86_CR0_PE), %eax
- 	movl	%eax, %cr0
- 
- 	lret
- 
--	.code64
--paging_enabled:
--	/* Return from the trampoline */
--	jmp	*%rdi
--
--	/*
--         * The trampoline code has a size limit.
--         * Make sure we fail to compile if the trampoline code grows
--         * beyond TRAMPOLINE_32BIT_CODE_SIZE bytes.
--	 */
--	.org	trampoline_32bit_src + TRAMPOLINE_32BIT_CODE_SIZE
--
--	.code32
- no_longmode:
--	/* This isn't an x86-64 CPU, so hang intentionally, we cannot continue */
-+	/* This isn't an x86-64 CPU so hang */
- 1:
- 	hlt
- 	jmp     1b
--- 
-2.14.4
-