diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-22 15:42:47 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-22 15:42:47 -0500 |
commit | 3bfe7773d635cd9073510f2fba18e76150a6487a (patch) | |
tree | 216947df57907ae8c1c49d0818e80679f4f8a643 | |
parent | 08cb3a2b46ecca75fd23bc1ba9f7558cc8996c35 (diff) | |
download | kernel-3bfe7773d635cd9073510f2fba18e76150a6487a.tar.gz kernel-3bfe7773d635cd9073510f2fba18e76150a6487a.tar.xz kernel-3bfe7773d635cd9073510f2fba18e76150a6487a.zip |
Linux v3.19-rc5-134-gf8de05ca38b7
-rw-r--r-- | Add-option-to-automatically-enforce-module-signature.patch | 6 | ||||
-rw-r--r-- | Add-secure_modules-call.patch | 6 | ||||
-rw-r--r-- | Add-sysrq-option-to-disable-secure-boot-mode.patch | 4 | ||||
-rw-r--r-- | kernel.spec | 5 | ||||
-rw-r--r-- | sources | 2 |
5 files changed, 13 insertions, 10 deletions
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch index 39c63fc02..c1fa16646 100644 --- a/Add-option-to-automatically-enforce-module-signature.patch +++ b/Add-option-to-automatically-enforce-module-signature.patch @@ -146,7 +146,7 @@ index ab4734e5411d..5d52d67d5097 100644 * Parse the ACPI tables for possible boot-time SMP configuration. */ diff --git a/include/linux/module.h b/include/linux/module.h -index 089de6be8062..6a586a83ba7e 100644 +index d4b96d6c926a..c47f75720dbd 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add); @@ -163,10 +163,10 @@ index 089de6be8062..6a586a83ba7e 100644 extern int modules_disabled; /* for sysctl */ diff --git a/kernel/module.c b/kernel/module.c -index fd8c5495fdc6..5f8c11de61fe 100644 +index 98c3d7955a51..6244f24abe27 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -3851,6 +3851,13 @@ void module_layout(struct module *mod, +@@ -3896,6 +3896,13 @@ void module_layout(struct module *mod, EXPORT_SYMBOL(module_layout); #endif diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch index f517ccf02..84ff314ac 100644 --- a/Add-secure_modules-call.patch +++ b/Add-secure_modules-call.patch @@ -16,7 +16,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com> 2 files changed, 17 insertions(+) diff --git a/include/linux/module.h b/include/linux/module.h -index ebfb0e153c6a..089de6be8062 100644 +index b653d7c0a05a..d4b96d6c926a 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -502,6 +502,8 @@ int unregister_module_notifier(struct notifier_block *nb); @@ -41,10 +41,10 @@ index ebfb0e153c6a..089de6be8062 100644 #ifdef CONFIG_SYSFS diff --git a/kernel/module.c b/kernel/module.c -index 3965511ae133..fd8c5495fdc6 100644 +index d856e96a3cce..98c3d7955a51 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -3850,3 +3850,13 @@ void module_layout(struct module *mod, +@@ -3895,3 +3895,13 @@ void module_layout(struct module *mod, } EXPORT_SYMBOL(module_layout); #endif diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch index 174227f93..bbd41f249 100644 --- a/Add-sysrq-option-to-disable-secure-boot-mode.patch +++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch @@ -215,7 +215,7 @@ index 387fa7d05c98..4b07e30b3279 100644 int unregister_sysrq_key(int key, struct sysrq_key_op *op); struct sysrq_key_op *__sysrq_get_key_op(int key); diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c -index f191bddf64b8..0cf8a7d49b91 100644 +index 7b40c5f07dce..8a60477b96e1 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -1968,7 +1968,7 @@ static int kdb_sr(int argc, const char **argv) @@ -228,7 +228,7 @@ index f191bddf64b8..0cf8a7d49b91 100644 return 0; diff --git a/kernel/module.c b/kernel/module.c -index 5f8c11de61fe..13bed977f554 100644 +index 6244f24abe27..b77554170d76 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -107,9 +107,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ diff --git a/kernel.spec b/kernel.spec index 320ce4d5d..f4259b333 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 5 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2203,6 +2203,9 @@ fi # ||----w | # || || %changelog +* Thu Jan 22 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc5.git2.1 +- Linux v3.19-rc5-134-gf8de05ca38b7 + * Wed Jan 21 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc5.git1.1 - Linux v3.19-rc5-117-g5eb11d6b3f55 - Reenable debugging options. @@ -1,4 +1,4 @@ 9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz 813ccb96f0b379d656e57442c2587ca3 perf-man-3.18.tar.gz 5d644fab7b6bf09ac75d5695128fc547 patch-3.19-rc5.xz -75ab61cc839db9578db62a10e1a727c2 patch-3.19-rc5-git1.xz +1e90c4d19226587cca382007188f4091 patch-3.19-rc5-git2.xz |