Skip to content
This repository has been archived by the owner on Sep 18, 2020. It is now read-only.

Upgrade Linux 4.19.109 to 4.19.111 #3901

Merged
merged 1 commit into from
Mar 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare pretend setup unpack
DEPEND==sys-kernel/coreos-modules-4.19.109 app-arch/gzip app-shells/bash coreos-base/coreos-init:= sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/nvme-cli 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.19.109
DEPEND==sys-kernel/coreos-modules-4.19.111 app-arch/gzip app-shells/bash coreos-base/coreos-init:= sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/nvme-cli 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.19.111
DESCRIPTION=CoreOS Linux kernel
EAPI=5
HOMEPAGE=http://www.kernel.org
IUSE=kernel_linux
KEYWORDS=amd64
LICENSE=GPL-2 freedist
RDEPEND==sys-kernel/coreos-modules-4.19.109
RDEPEND==sys-kernel/coreos-modules-4.19.111
RESTRICT=binchecks strip
SLOT=0/4.19.109
SLOT=0/4.19.111
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
_md5_=1a19bf8157015b4dcd933d7281d1920d
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
DEPEND==sys-kernel/coreos-sources-4.19.109
DEPEND==sys-kernel/coreos-sources-4.19.111
DESCRIPTION=CoreOS Linux kernel modules
EAPI=5
HOMEPAGE=http://www.kernel.org
Expand All @@ -8,6 +8,6 @@ KEYWORDS=amd64
LICENSE=GPL-2 freedist
RDEPEND=!<sys-kernel/coreos-kernel-4.6.3-r1
RESTRICT=binchecks strip
SLOT=0/4.19.109
SLOT=0/4.19.111
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ KEYWORDS=amd64
LICENSE=GPL-2
RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
RESTRICT=binchecks strip
SLOT=4.19.109
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.109.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
SLOT=4.19.111
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.111.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 kernel-2 b2fdd65b5edb72d87dedaa82df19553c ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=d79cabc85557a16224cb73e5803fb741
2 changes: 1 addition & 1 deletion sys-kernel/coreos-sources/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
DIST patch-4.19.109.xz 2891684 BLAKE2B 3bec8f0eefb4479f04021a72216cbe6a12ad09c5e0a7fccfde73729d3f56719c075dc33778d4498b3052be388632cdd9d4e98ff4628c3bdc5a4e46cb2b61b359 SHA512 8a5334c2746512f863df1db95cedbc8255d1fff18779bfbbdb2dfbc00f96235af96cf7c62a7aea3fb07046de9c2e2b1a5902f146d14e5a8f5717793c8031550d
DIST patch-4.19.111.xz 2904888 BLAKE2B 2ab049c5a4acf650f88baa624955a64af9dc090bd2272960c50f0d197879ffb229566ccc5f266c4697ecc0d9ff83b5789b3eba9da6d874a67c2166de0cea7c8a SHA512 e6571ced6fe4a0414e956ff1afbbcb738b9a0571a97a1986202e043d58a3eaf81394f7f412339bc8b7c3e02a9a0c0a7cf65feefeee1fdedacf7762994aa55cf3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b303f53030e83be299cb79dde4b2094772e45df5 Mon Sep 17 00:00:00 2001
From 2ac00d9446a5a313c90e3c26c409f83fcdf1bcce Mon Sep 17 00:00:00 2001
From: Vito Caputo <[email protected]>
Date: Wed, 25 Nov 2015 02:59:45 -0800
Subject: [PATCH 1/3] kbuild: derive relative path for KBUILD_SRC from CURDIR
Expand All @@ -12,7 +12,7 @@ by some undesirable path component.
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 059c5e0aac15..83afbde6f792 100644
index fed04bdef0a3..5684a706648b 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7a785a1f353d613896945355f287c9d60e215373 Mon Sep 17 00:00:00 2001
From eafde63912e0eead0bdaa468e32c15c24e71324c Mon Sep 17 00:00:00 2001
From: David Michael <[email protected]>
Date: Thu, 8 Feb 2018 21:23:12 -0500
Subject: [PATCH 2/3] tools/objtool/Makefile: Don't fail on fallthrough with
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5a6bf5a94a004ae2538d71c5dbd7d45d76a9d17b Mon Sep 17 00:00:00 2001
From 7a2549bfd7eba36c7b65106ca69b290a933b73d2 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <[email protected]>
Date: Fri, 26 Oct 2018 17:00:56 -0700
Subject: [PATCH 3/3] net/netfilter: add nf_conntrack_ipv4 compat module for
Expand Down