diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-21 13:05:41 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-21 13:05:41 -0400 |
| commit | 5724250a0ad240f39326cf6ba1d15593fe0fd95f (patch) | |
| tree | e2403d6c23f3fdd154b52b52138943560f0c0428 | |
| parent | f20b3e7657b3c07a39b5789e97a0e412a9f73d7a (diff) | |
| download | kernel-5724250a0ad240f39326cf6ba1d15593fe0fd95f.tar.gz kernel-5724250a0ad240f39326cf6ba1d15593fe0fd95f.tar.xz kernel-5724250a0ad240f39326cf6ba1d15593fe0fd95f.zip | |
Linux v4.5-9542-g643ad15d4741
- pekeys, efi, objtool merges
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | config-x86_64-generic | 2 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 6 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 10 insertions, 3 deletions
diff --git a/config-generic b/config-generic index b16ce44bd..e98aa34df 100644 --- a/config-generic +++ b/config-generic @@ -4842,6 +4842,7 @@ CONFIG_DEBUG_INFO_VTA=y # CONFIG_DEBUG_INFO_SPLIT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set CONFIG_FRAME_POINTER=y +CONFIG_STACK_VALIDATION=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_DEBUG_DRIVER is not set CONFIG_HEADERS_CHECK=y diff --git a/config-x86_64-generic b/config-x86_64-generic index 1ccddd9bd..071551574 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -26,6 +26,8 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 # https://lists.fedoraproject.org/pipermail/kernel/2013-December/004753.html CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 +CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y + # enable the 32-bit entry point for Baytrail CONFIG_EFI_MIXED=y @@ -1 +1 @@ -46e595a17dcf11404f713845ecb5b06b92a94e43 +643ad15d47410d37d43daf3ef1c8ac52c281efa5 diff --git a/kernel.spec b/kernel.spec index d3590becc..f1f0921e4 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 15 +%define gitrev 16 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2151,6 +2151,10 @@ fi # # %changelog +* Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git16.1 +- Linux v4.5-9542-g643ad15d4741 +- pekeys, efi, objtool merges + * Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git15.1 - Linux v4.5-9406-g46e595a17dcf - xtensa, mailbox, vhost, all the armsoc merges @@ -1,3 +1,3 @@ a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz 6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz -1034b54b04263544264016c73c6ba561 patch-4.5-git15.xz +f2cc9fe3fd4714d257fb93957d7ca7bb patch-4.5-git16.xz |