summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--efi-lockdown.patch2
-rw-r--r--gitrev2
-rw-r--r--kernel.spec5
-rw-r--r--sources2
4 files changed, 7 insertions, 4 deletions
diff --git a/efi-lockdown.patch b/efi-lockdown.patch
index db408efb5..ceb0ca7f9 100644
--- a/efi-lockdown.patch
+++ b/efi-lockdown.patch
@@ -1846,7 +1846,7 @@ index e24aa3241387..3ea87a004771 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1848,6 +1848,9 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
- if (!capable(CAP_SYS_ADMIN) && sysctl_unprivileged_bpf_disabled)
+ if (sysctl_unprivileged_bpf_disabled && !capable(CAP_SYS_ADMIN))
return -EPERM;
+ if (kernel_is_locked_down("BPF"))
diff --git a/gitrev b/gitrev
index 68ebc78b1..dc1eb3836 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-3215b9d57a2c75c4305a3956ca303d7004485200
+f36b7534b83357cf52e747905de6d65b4f7c2512
diff --git a/kernel.spec b/kernel.spec
index 288a5aeed..1263dfe82 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 6
# The git snapshot level
-%define gitrev 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -1895,6 +1895,9 @@ fi
#
#
%changelog
+* Fri Mar 23 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc6.git3.1
+- Linux v4.16-rc6-384-gf36b7534b833
+
* Thu Mar 22 2018 Peter Robinson <pbrobinson@fedoraproject.org>
- Wifi fixes for QCom DragonBoard 410c
diff --git a/sources b/sources
index adf3e2998..2e4a922b0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
SHA512 (patch-4.16-rc6.xz) = c052f570e1792f26c989a87a772b4628d2e6a7a3ea9d133f8738135ea26286b51ec0c248022d1edf6bb565dc07002129ed75da31a3e64951d3978da7e262010b
-SHA512 (patch-4.16-rc6-git2.xz) = 3b15e7396c68cd718fd54e00554b558d2677f21d0f8e8fa307f4ad9d31aad7cbb0c5b18bd22737084d3be36d0a3d411d704685e6082f78d9d5e2a2f67d40ba13
+SHA512 (patch-4.16-rc6-git3.xz) = f5149875d7738eeb5f6b02634e72a78765ec76e826ad56815bb7823fe76580d0c127b6cd85ddfff51389fbcca688cbcc0d8fea6b56f90a7f4043a9841b06c474