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

Merge pull request #3088 from dm0-/linux

Browse Source 
Bump Linux 4.14.20 to 4.14.21 and 4.15.4 to 4.15.5
This commit is contained in:
David Michael 2018-02-22 20:07:30 -05:00 committed by GitHub
commit 7cf1aa4e41
16 changed files with 19 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.15.4-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.21.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.20-r2.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.15.5.ebuild vendored
View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
COREOS_SOURCE_REVISION="-r1"
COREOS_SOURCE_REVISION=""
inherit coreos-kernel
DESCRIPTION="CoreOS Linux kernel"

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.15.4-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.21.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.20-r2.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.15.5.ebuild vendored
View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
COREOS_SOURCE_REVISION="-r1"
COREOS_SOURCE_REVISION=""
inherit coreos-kernel savedconfig
DESCRIPTION="CoreOS Linux kernel modules"

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

@ -1,4 +1,4 @@
DIST linux-4.14.tar.xz 100770500 SHA256 f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 WHIRLPOOL fee10d54ecb210156aa55364ecc15867127819e9f7ff9ec5f6ef159b1013e2ae3d3a28d35c62d663886cbe826b996a1387671766093be002536309045a8e4d10
DIST linux-4.15.tar.xz 102181404 SHA256 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea WHIRLPOOL 8f08cf5885c85b9f4959ed52e0c479ff0961143c7c515393c73a7a41dd301f9557f38cfa4093e943989cffd13e11d9524bf75c778a2e9359da4b5d98df222075
DIST patch-4.14.20.xz 606524 SHA256 ec38313c7ff463f781fb36502d4b49811a903462f031c5392b95231cc371190f SHA512 1ddddb3a8eeed75bf650b749fa04712d0db67615e4cc6195dc43046797970f3b459299b71366b9a254fa6c6c3896339c3cef65d93b4097ab90a5cfbb6aa1c445 WHIRLPOOL 6f65b6b7d6d19b85a7415b5e2eb6092ad1548f2a0d6a22a05f3d50b79b7778ed1f07ed8b80be88d9e11de59ffcf6d6cb655cf1e4084f04304f0fabdca1480d56
DIST patch-4.15.4.xz 125900 SHA256 5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8 SHA512 e903b02631f5fa261db44ea2da69b6edc3afbbbbb4da5eca6abf2972b9f5aeb032d6b4b22c1313eef7763bc91987ec793b05c00c04a0ec592f61cb5a82cea296 WHIRLPOOL e2b0074a358df15ce031af6b6b5da0ccfd380664058dec4af9abdafc6e588f7795d8f55e9f186322985b373fb4d25f4c7bd2951c36ec065adb1f129be115bc19
DIST patch-4.14.21.xz 678316 SHA256 4d888fb78a52e556948483c8410159a83c51195eb7637f084d6f19f014fff448 SHA512 90a85a110b8b9ff79e0f7e6e47149bd118e62c479506ef3605c06d688983e5b7da482dc06e0de1133f0cf6860cd66a2340191c827d5809dd3a5f81e271f57e14 WHIRLPOOL 23875a92cb2847030863097ae10d84d8721e13cb078a2a35aa2bf68031f394945688c03630ae3e34727a4d4ec1daae14d2fe008df448e55791e4785ee80ae7b5
DIST patch-4.15.5.xz 175268 SHA256 b5dc7021bd0c08e4a58b59035f9b757ce6909b46067950ac56d2ad68c1b69dd1 SHA512 a2f3777a694e27847dfc04178d2ef2721cf30bd6036c2738964403b78d6979ff885cbf2a569716ff7e0585399490731bb7a47f7cfdf4bb7f3a62e80fe1329061 WHIRLPOOL 53ece0cd5e8fe2b53659606ae3faa7e6f63c24db701e29c00d9377fa717ad5e0fe51336aca8b101d4201087da6a76ed96cc587a7c5ca5a267ce30db4176ac4e6

1
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.20-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.21.ebuild vendored
View File

@ -36,5 +36,4 @@ UNIPATCH_LIST="
${PATCH_DIR}/z0003-block-factor-out-__blkdev_issue_zero_pages.patch \
${PATCH_DIR}/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch \
${PATCH_DIR}/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
${PATCH_DIR}/z0006-scsi-core-check-for-device-state-in-__scsi_remove_ta.patch \
"

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.15.4.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.15.5.ebuild vendored
View File

6
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 vendored
View File

@ -1,7 +1,7 @@
From 0fca0c005654446e06d4f0bd5ebd6da837f759fa Mon Sep 17 00:00:00 2001
From 915aca0af95e510f86d3b63ab3e14e58a399d0f8 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
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 33176140f133..16206c58e8e4 100644
index 68d70485b088..0394c84d4684 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

4
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch vendored
View File

@ -1,7 +1,7 @@
From f09f2ff8ea5d11d80aa01b79408ed16f8495695c Mon Sep 17 00:00:00 2001
From 51c6cb5f284552f90feb3a4fa09ea5d1f4e3a53d 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
Subject: [PATCH 2/5] Add arm64 coreos verity hash
Signed-off-by: Geoff Levand <geoff@infradead.org>
---

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

@ -1,7 +1,7 @@
From 47ee25d1e40caddede4d112ed31981a75ac044a5 Mon Sep 17 00:00:00 2001
From f3cb702f466ea491592b6e8e46575c699242d2c2 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/6] block: factor out __blkdev_issue_zero_pages()
Subject: [PATCH 3/5] block: factor out __blkdev_issue_zero_pages()
blkdev_issue_zeroout() will use this in !BLKDEV_ZERO_NOFALLBACK case.

4
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 vendored
View File

@ -1,7 +1,7 @@
From e5118a5a1f0c2d93b031c0abf052796cac467abf Mon Sep 17 00:00:00 2001
From e10e06b051b2944b6dc07b980f9fa5ebef748c6d 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/6] block: cope with WRITE ZEROES failing in
Subject: [PATCH 4/5] block: cope with WRITE ZEROES failing in
blkdev_issue_zeroout()
sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to

4
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch vendored
View File

@ -1,7 +1,7 @@
From 2d24ec4d7da24bcf2d54cafd9629ee7ec6215c11 Mon Sep 17 00:00:00 2001
From 8aadde8f43854bcbab37dfd71b889047cbbee27f 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/6] tools/objtool/Makefile: Don't fail on fallthrough with
Subject: [PATCH 5/5] tools/objtool/Makefile: Don't fail on fallthrough with
new GCCs
---

40
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-scsi-core-check-for-device-state-in-__scsi_remove_ta.patch vendored
View File

@ -1,40 +0,0 @@
From 0767c48172ef761cffa22929298ec900be8aba4a Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Wed, 13 Dec 2017 14:21:37 +0100
Subject: [PATCH 6/6] scsi: core: check for device state in
__scsi_remove_target()
As it turned out device_get() doesn't use kref_get_unless_zero(), so we
will be always getting a device pointer. Consequently, we need to check
for the device state in __scsi_remove_target() to avoid tripping over
deleted objects.
Fixes: fbce4d97fd43 ("scsi: fixup kernel warning during rmmod()")
Reported-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---
drivers/scsi/scsi_sysfs.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index f796bd61f3f0..40406c162d0d 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1383,7 +1383,10 @@ static void __scsi_remove_target(struct scsi_target *starget)
* check.
*/
if (sdev->channel != starget->channel ||
- sdev->id != starget->id ||
+ sdev->id != starget->id)
+ continue;
+ if (sdev->sdev_state == SDEV_DEL ||
+ sdev->sdev_state == SDEV_CANCEL ||
!get_device(&sdev->sdev_gendev))
continue;
spin_unlock_irqrestore(shost->host_lock, flags);
--
2.14.3

4
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch vendored
View File

@ -1,4 +1,4 @@
From d56cde4677e3e4d40e54a58fca47e66c08534d52 Mon Sep 17 00:00:00 2001
From 9e395fb051073b3c34cb5b5a5ecade3fbc2d8775 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/3] 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 8495e1ca052e..6c51d521eacf 100644
index 28c537fbe328..d17680f16087 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0002-Add-arm64-coreos-verity-hash.patch vendored
View File

@ -1,4 +1,4 @@
From fc851cfbf737fe6bc4e02179be5a68f747effe65 Mon Sep 17 00:00:00 2001
From 029ee55ef70bba5853e4c1bc2906814d6bc0b883 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/3] Add arm64 coreos verity hash

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch vendored
View File

@ -1,4 +1,4 @@
From 2fe1fe29897260e2a0246c1f159359836b647fb8 Mon Sep 17 00:00:00 2001
From 598f0494a22a7b2b74b3677227dcc26fc4a98d9a 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/3] tools/objtool/Makefile: Don't fail on fallthrough with