diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-08-05 01:20:51 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-08-05 01:24:26 -0700 |
| commit | fbaf37afa4ef87d3ea16983964383f287896e754 (patch) | |
| tree | 5db0899ef7d23d533a0a7c68789c65068dd2abc8 | |
| parent | 9e210819de8d61e4a79fa6aa4461843e15665c14 (diff) | |
| download | kernel-fbaf37afa4ef87d3ea16983964383f287896e754.tar.gz kernel-fbaf37afa4ef87d3ea16983964383f287896e754.tar.xz kernel-fbaf37afa4ef87d3ea16983964383f287896e754.zip | |
Linux v4.7-11891-gdd7fd3a
| -rw-r--r-- | Add-secure_modules-call.patch | 18 | ||||
| -rw-r--r-- | config-generic | 3 | ||||
| -rw-r--r-- | config-powerpc64-generic | 1 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | sources | 2 |
6 files changed, 19 insertions, 12 deletions
diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch index 5c272a983..1cbf3afd9 100644 --- a/Add-secure_modules-call.patch +++ b/Add-secure_modules-call.patch @@ -1,7 +1,7 @@ -From 0f6eec5ca124baf1372fb4edeacd11a002378f5e Mon Sep 17 00:00:00 2001 +From 3213f1513a744fb21b6b9e4d4f2650a204855b3e Mon Sep 17 00:00:00 2001 From: Matthew Garrett <matthew.garrett@nebula.com> Date: Fri, 9 Aug 2013 17:58:15 -0400 -Subject: [PATCH 01/20] Add secure_modules() call +Subject: [PATCH] Add secure_modules() call Provide a single call to allow kernel code to determine whether the system has been configured to either disable module loading entirely or to load @@ -17,10 +17,10 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com> 2 files changed, 16 insertions(+) diff --git a/include/linux/module.h b/include/linux/module.h -index 3daf2b3..082298a 100644 +index 0c3207d..05bd6c9 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -655,6 +655,8 @@ static inline bool is_livepatch_module(struct module *mod) +@@ -641,6 +641,8 @@ static inline bool is_livepatch_module(struct module *mod) } #endif /* CONFIG_LIVEPATCH */ @@ -28,8 +28,8 @@ index 3daf2b3..082298a 100644 + #else /* !CONFIG_MODULES... */ - /* Given an address, look for it in the exception tables. */ -@@ -771,6 +773,10 @@ static inline bool module_requested_async_probing(struct module *module) + static inline struct module *__module_address(unsigned long addr) +@@ -750,6 +752,10 @@ static inline bool module_requested_async_probing(struct module *module) return false; } @@ -41,10 +41,10 @@ index 3daf2b3..082298a 100644 #ifdef CONFIG_SYSFS diff --git a/kernel/module.c b/kernel/module.c -index 5f71aa6..3c38496 100644 +index 529efae..0332fdd 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -4199,3 +4199,13 @@ void module_layout(struct module *mod, +@@ -4279,3 +4279,13 @@ void module_layout(struct module *mod, } EXPORT_SYMBOL(module_layout); #endif @@ -59,5 +59,5 @@ index 5f71aa6..3c38496 100644 +} +EXPORT_SYMBOL(secure_modules); -- -2.5.5 +2.9.2 diff --git a/config-generic b/config-generic index 005adb193..4047344f0 100644 --- a/config-generic +++ b/config-generic @@ -199,6 +199,7 @@ CONFIG_INFINIBAND_OCRDMA=m CONFIG_INFINIBAND_USNIC=m CONFIG_INFINIBAND_RDMAVT=m +CONFIG_RDMA_RXE=m # # Executable file formats @@ -4745,6 +4746,8 @@ CONFIG_NFSD_PNFS=y CONFIG_NFSD_BLOCKLAYOUT=y CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V4_SECURITY_LABEL=y +# This is labeled as 'bare minimum' and 'not for production' +# CONFIG_NFSD_FLEXFILELAYOUT is not set CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_PNFS_OBJLAYOUT=m diff --git a/config-powerpc64-generic b/config-powerpc64-generic index 8e19373c9..ed55cfcd0 100644 --- a/config-powerpc64-generic +++ b/config-powerpc64-generic @@ -162,6 +162,7 @@ CONFIG_SCSI_IBMVSCSI=m CONFIG_SCSI_IPR=m CONFIG_SCSI_IPR_TRACE=y CONFIG_SCSI_IPR_DUMP=y +CONFIG_SCSI_IBMVSCSIS=m CONFIG_SERIAL_ICOM=m # CONFIG_SERIAL_8250 is not set @@ -1 +1 @@ -96b585267f552d4b6a28ea8bd75e5ed03deb6e71 +dd7fd3a82ce55e5772d41b1faa2439f15318a902 diff --git a/kernel.spec b/kernel.spec index 69cf5d50f..0c339ef6a 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 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2135,6 +2135,9 @@ fi # # %changelog +* Fri Aug 05 2016 Laura Abbott <labbott@redhat.com> - 4.8.0-0.rc0.git7.1 +- Linux v4.7-11891-gdd7fd3a + * Thu Aug 04 2016 Laura Abbott <labbott@redhat.com> - 4.8.0-0.rc0.git6.1 - Linux v4.7-11544-g96b5852 @@ -1,3 +1,3 @@ 5276563eb1f39a048e4a8a887408c031 linux-4.7.tar.xz fe259c02c75eec61d1aa4b1211f3c853 perf-man-4.7.tar.gz -49f6889a0303e4aef5f3b604d8642da0 patch-4.7-git6.xz +b3f0d17b8d20d874a419f7d7671d5dda patch-4.7-git7.xz |