From dc42e4c06a61f975994b6f94bd9b64c85df9adfa Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 16 Mar 2016 15:36:23 -0400 Subject: [PATCH] Linux v4.5-1402-gaa6865d83641 - s390, m68k, avr32, KVM, EDAC merges --- config-arm64 | 1 + gitrev | 2 +- kernel.spec | 6 +++++- sources | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config-arm64 b/config-arm64 index 773a35ee5..438e832df 100644 --- a/config-arm64 +++ b/config-arm64 @@ -50,6 +50,7 @@ CONFIG_ARM64_64K_PAGES=y CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y CONFIG_ARM64_LSE_ATOMICS=y +CONFIG_ARM64_VHE=y CONFIG_BCMA_POSSIBLE=y CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 diff --git a/gitrev b/gitrev index 7c4e81be9..0d3ad3010 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -9256d5a308c95a50c6e85d682492ae1f86a70f9b +aa6865d836418eb2ba888a4cb1318a28e9aa2e0c diff --git a/kernel.spec b/kernel.spec index 88325e9ee..3459dcdde 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 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2143,6 +2143,10 @@ fi # # %changelog +* Wed Mar 16 2016 Josh Boyer - 4.6.0-0.rc0.git4.1 +- Linux v4.5-1402-gaa6865d83641 +- s390, m68k, avr32, KVM, EDAC merges + * Wed Mar 16 2016 Josh Boyer - 4.6.0-0.rc0.git3.1 - Linux v4.5-1127-g9256d5a308c9 - pinctrl, LED, rtc, hwmon, regulator, regmap, spi merges diff --git a/sources b/sources index b1d90880c..7c47bfed4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz 6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz -82ccc1e6707497a0325a35ef6acf5c38 patch-4.5-git3.xz +98443081089b9cbc0619ba65649aa183 patch-4.5-git4.xz