diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-21 09:06:46 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-21 09:06:46 -0400 |
| commit | da001e90887604dd0244312a3c0ab94a4fd8c889 (patch) | |
| tree | 7cd9d05d64e42dfb65abea70b48c49fee9e25b03 | |
| parent | a702c978d30903176c9ab9d45a991993bc4297e5 (diff) | |
| download | kernel-da001e90887604dd0244312a3c0ab94a4fd8c889.tar.gz kernel-da001e90887604dd0244312a3c0ab94a4fd8c889.tar.xz kernel-da001e90887604dd0244312a3c0ab94a4fd8c889.zip | |
Linux v4.5-8524-g1e75a9f34a5e
- watchdog, firewire, vfs, linux-arm, sh, powerpc, audit, device tree merges
| -rw-r--r-- | config-arm64 | 2 | ||||
| -rw-r--r-- | config-armv7-generic | 3 | ||||
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | config-powerpc64le | 2 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 6 | ||||
| -rw-r--r-- | sources | 2 |
7 files changed, 16 insertions, 3 deletions
diff --git a/config-arm64 b/config-arm64 index 394ea2d95..4f98e9df6 100644 --- a/config-arm64 +++ b/config-arm64 @@ -85,6 +85,8 @@ CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_SYS_HYPERVISOR is not set +# CONFIG_ARM_SBSA_WATCHDOG is not set + CONFIG_RTC_DRV_EFI=y CONFIG_ACPI=y diff --git a/config-armv7-generic b/config-armv7-generic index aed2da718..f977acce7 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -48,6 +48,9 @@ CONFIG_CPU_SW_DOMAIN_PAN=y # CONFIG_XIP_KERNEL is not set # CONFIG_ARM_VIRT_EXT is not set +# CONFIG_DEBUG_RODATA is not set +# CONFIG_DEBUG_ALIGN_RODATA is not set + # Platforms enabled/disabled globally on ARMv7 CONFIG_ARCH_BCM2835=y CONFIG_ARCH_EXYNOS=y diff --git a/config-generic b/config-generic index 4cd526b83..b16ce44bd 100644 --- a/config-generic +++ b/config-generic @@ -3220,6 +3220,8 @@ CONFIG_WM831X_WATCHDOG=m # CONFIG_CADENCE_WATCHDOG is not set # CONFIG_BCM7038_WDT is not set # CONFIG_ZIIRAVE_WATCHDOG is not set +# CONFIG_EBC_C384_WDT is not set +# CONFIG_NI903X_WDT is not set CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m diff --git a/config-powerpc64le b/config-powerpc64le index 7d9f3fc3a..ec80e8bf4 100644 --- a/config-powerpc64le +++ b/config-powerpc64le @@ -2,5 +2,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_POWER7_CPU=y +CONFIG_DISABLE_MPROFILE_KERNEL=y + # https://fedoraproject.org/wiki/Features/Checkpoint_Restore CONFIG_CHECKPOINT_RESTORE=y @@ -1 +1 @@ -1200b6809dfd9d73bc4c7db76d288c35fa4b2ebe +1e75a9f34a5ed5902707fb74b468356c55142b71 diff --git a/kernel.spec b/kernel.spec index a3e1587e1..ca7587e7f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 13 +%define gitrev 14 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2153,6 +2153,10 @@ fi # # %changelog +* Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git14.1 +- Linux v4.5-8524-g1e75a9f34a5e +- watchdog, firewire, vfs, linux-arm, sh, powerpc, audit, device tree merges + * Sat Mar 19 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git13.1 - Linux v4.5-8194-g1200b6809dfd - net merge @@ -1,3 +1,3 @@ a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz 6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz -88332b6b2ce510b016beecb992c60fb4 patch-4.5-git13.xz +ef7eff3ee0ad581ed63c76552b70c09f patch-4.5-git14.xz |