diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-29 00:33:19 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-29 00:33:19 +0200 |
commit | 49c54c11d011e7b21b56328b068037b953f7f166 (patch) | |
tree | 73b8088ea178e339b05c6f98777c8b0a065f1941 | |
parent | e72ca1217918812dc025defd0582e3116be37e59 (diff) | |
parent | b7cebf944ae9f9e97d9f55bc2ee6d964b4268edd (diff) | |
download | kernel-49c54c11d011e7b21b56328b068037b953f7f166.tar.gz kernel-49c54c11d011e7b21b56328b068037b953f7f166.tar.xz kernel-49c54c11d011e7b21b56328b068037b953f7f166.zip |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc2.git3.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc2.git3.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc2.git3.1.vanilla.knurd.1.fc25kernel-4.13.0-0.rc2.git3.1.vanilla.knurd.1.fc24
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 3 | ||||
-rw-r--r-- | kernel-s390x.config | 3 | ||||
-rw-r--r-- | kernel.spec | 8 | ||||
-rw-r--r-- | sources | 2 |
5 files changed, 13 insertions, 5 deletions
@@ -1 +1 @@ -da08f35b0f82b0a7a79f518faf8d0c0b477f91bc +0b5477d9dabd96ded4c5ef7a5f08b00188fc1dec diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index a69ba3478..25977b5f7 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -654,7 +654,7 @@ CONFIG_CGROUPS=y # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set # CONFIG_CHARGER_SMB347 is not set -# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_CHECKPOINT_RESTORE=y CONFIG_CHECK_STACK=y CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1=m @@ -2573,6 +2573,7 @@ CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set +CONFIG_MEM_SOFT_DIRTY=y # CONFIG_MEMSTICK_DEBUG is not set # CONFIG_MEMSTICK is not set CONFIG_MEMSTICK_JMICRON_38X=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 870bed495..7f0886fc8 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -653,7 +653,7 @@ CONFIG_CGROUPS=y # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set # CONFIG_CHARGER_SMB347 is not set -# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_CHECKPOINT_RESTORE=y CONFIG_CHECK_STACK=y CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1=m @@ -2552,6 +2552,7 @@ CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set +CONFIG_MEM_SOFT_DIRTY=y # CONFIG_MEMSTICK_DEBUG is not set # CONFIG_MEMSTICK is not set CONFIG_MEMSTICK_JMICRON_38X=m diff --git a/kernel.spec b/kernel.spec index 9c507baf4..03cd590c9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2215,6 +2215,12 @@ fi # # %changelog +* Fri Jul 28 2017 Adrian Reber <adrian@lisas.de> +- Enable CHECKPOINT_RESTORE on s390x + +* Fri Jul 28 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc2.git3.1 +- Linux v4.13-rc2-110-g0b5477d9dabd + * Thu Jul 27 2017 Laura Abbott <labbott@fedoraproject.org> - Revert patch breaking mustang boot @@ -1,4 +1,4 @@ SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 SHA512 (patch-4.13-rc2.xz) = 0ebedff0a8e1ec90959918863710523247aefd7627ab327436caddcb768e1f6269820e816ccc5f8447ab8d2ca6fe665119556e7e15a9753ae061fbfbfb01410f -SHA512 (patch-4.13-rc2-git2.xz) = 10da8936866df1b153ce128800b97c9bc61f13622152316a87ba2d4000d4ff57190833ece1ebf65c3222f1bd4764888a99c8ca762c12e878dcc8dc7a89931b55 +SHA512 (patch-4.13-rc2-git3.xz) = 070a0ccb325ff4c924b84b668c3a2518c3bdbce02cc3e1d0503fe6fa37c3a76fb5279fb731a7acdff6b3cc908f7304c6d3073246ceedef339fa353c148884b73 |