Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/91'
Browse files Browse the repository at this point in the history
* origin/pr/91:
  Update to kernel-5.2.14
  • Loading branch information
marmarek committed Sep 15, 2019
2 parents 1d50db3 + 9aac829 commit c7cfdfe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions config-base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Base config based on Fedora's config (kernel-core-5.2.11-200.fc30.x86_64.rpm)
# Base config based on Fedora's config (kernel-core-5.2.13-200.fc30.x86_64.rpm)
# Only modification is `yes '' | make oldconfig` to drop config settings which
# depend on Fedora patches and adjust for the small version difference.

Expand All @@ -21,7 +21,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT="5.2.11-200.fc30.x86_64"
CONFIG_BUILD_SALT="5.2.13-200.fc30.x86_64"
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.13
5.2.14

0 comments on commit c7cfdfe

Please sign in to comment.