diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-31 19:36:36 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-31 19:36:36 +0200 |
commit | 5c2730622f5da3bb18d3c36fb812355fb4db3488 (patch) | |
tree | 6eb7ad62a2634cda65cae2a6982c266727e38de8 | |
parent | 56c407fa52dc93dbbbcedac42407423468c208a8 (diff) | |
parent | f54f966100f4b64ddce1b8c38d97eb57298c1a9f (diff) | |
download | kernel-5c2730622f5da3bb18d3c36fb812355fb4db3488.tar.gz kernel-5c2730622f5da3bb18d3c36fb812355fb4db3488.tar.xz kernel-5c2730622f5da3bb18d3c36fb812355fb4db3488.zip |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
-rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1463225 | 1 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 1 | ||||
-rw-r--r-- | kernel-aarch64.config | 1 | ||||
-rw-r--r-- | kernel.spec | 3 |
4 files changed, 6 insertions, 0 deletions
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1463225 b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1463225 new file mode 100644 index 000000000..3e0b01e04 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1463225 @@ -0,0 +1 @@ +CONFIG_ARM64_ERRATUM_1463225=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 0f39f0cef..170e109a7 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -286,6 +286,7 @@ CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1165522=y CONFIG_ARM64_ERRATUM_1188873=y CONFIG_ARM64_ERRATUM_1286807=y +CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index f2e71a504..116e56f5d 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -286,6 +286,7 @@ CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1165522=y CONFIG_ARM64_ERRATUM_1188873=y CONFIG_ARM64_ERRATUM_1286807=y +CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y diff --git a/kernel.spec b/kernel.spec index 436d210bc..e89fcc78c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1849,6 +1849,9 @@ fi # # %changelog +* Fri May 31 2019 Laura Abbott <labbott@redhat.com> - 5.1.6-300 +- Linux v5.1.6 + * Sat May 25 2019 Jeremy Cline <jcline@redhat.com> - 5.1.5-300 - Linux v5.1.5 |