diff options
| -rw-r--r-- | baseconfig/CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED | 1 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-aarch64.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 1 | ||||
| -rw-r--r-- | kernel-i686-PAE.config | 1 | ||||
| -rw-r--r-- | kernel-i686-PAEdebug.config | 1 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 1 | ||||
| -rw-r--r-- | kernel-i686.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64p7-debug.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64p7.config | 1 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 1 | ||||
| -rw-r--r-- | kernel-s390x.config | 1 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-x86_64.config | 1 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | sources | 2 |
24 files changed, 27 insertions, 3 deletions
diff --git a/baseconfig/CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED b/baseconfig/CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED new file mode 100644 index 000000000..2cdeb93aa --- /dev/null +++ b/baseconfig/CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED @@ -0,0 +1 @@ +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y @@ -1 +1 @@ -9967468c0a109644e4a1f5b39b39bf86fe7507a7 +3b06b1a7448ee4e8e51dae3938774735404e51fb diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 07d30ac40..f4b7b20e6 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -6356,6 +6356,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index c215f3f77..4fcc7efd1 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6333,6 +6333,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 739ba39da..7826516e2 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -6922,6 +6922,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index f4df34591..7a4c05032 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -6475,6 +6475,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 3a1a30dcf..819af110e 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -6452,6 +6452,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index fe6786b09..b4fb68401 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -6899,6 +6899,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index b2c78dbe6..6afdbd2f7 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -5961,6 +5961,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 16f8bb990..79dd2fe8a 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -5983,6 +5983,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 019fd54b6..3f39a3658 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -5983,6 +5983,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-i686.config b/kernel-i686.config index 157f0a43e..cb7f270ec 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -5961,6 +5961,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 338a437f8..e5a9f0ff1 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -5765,6 +5765,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_RTAS=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 0a7a89ad1..3f7040dec 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -5741,6 +5741,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_RTAS=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 55846c668..b564f793b 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5694,6 +5694,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_RTAS=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index bf28bd95d..456e638f1 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5670,6 +5670,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_RTAS=m diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index c8ea08d33..0249d872b 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -5693,6 +5693,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_RTAS=m diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 7e1be23f9..bbfc91a32 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -5669,6 +5669,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_RTAS=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 3219c049c..d3c6f5aec 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5588,6 +5588,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAN is not set # CONFIG_WARN_DYNAMIC_STACK is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-s390x.config b/kernel-s390x.config index cc835750f..103ac0df6 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5564,6 +5564,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAN is not set # CONFIG_WARN_DYNAMIC_STACK is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 9ec05da64..65056c60c 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -6030,6 +6030,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 1abf5a976..794a5fafb 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -6008,6 +6008,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y diff --git a/kernel.spec b/kernel.spec index 8713ea891..f59289d21 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2180,6 +2180,9 @@ fi # # %changelog +* Wed Jul 12 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc0.git6.1 +- Linux v4.12-10784-g3b06b1a7448e + * Tue Jul 11 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc0.git5.1 - Linux v4.12-10624-g9967468 @@ -1,3 +1,3 @@ SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 -SHA512 (patch-4.12-git5.xz) = 38f60fb704cef6545ad4b611719e2221401bd5c503b7dd5feffa0931fc3fa57aeb1dbe39b455e62d6ac4da2b9e83c0012a5ef5b52126f06d41b10686ece23d4e +SHA512 (patch-4.12-git6.xz) = 715041f7a4e590884819e78080df1f906f0cef0cdf77e428e6444c1a739b2c16ee653cd97cf5b70fd416f8b1436fbbd98996d5d26a8de8db26e2e4061d3fddc2 |