Linux v4.1

4 files changed, 10 insertions, 59 deletions

diff --git a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
index 4d538035..92c3b310 100644
--- a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
+++ b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
@@ -43,7 +43,7 @@ Signed-off-by: Josh Stone <jistone@redhat.com>
  2 files changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 3ba504496cb2..43361e22734a 100644
+index f5c8983aeeb7..962bafd4a18e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -704,7 +704,11 @@ KBUILD_CFLAGS	+= -fomit-frame-pointer
diff --git a/kernel.spec b/kernel.spec
index 77be4394..00afbced 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 0
+%global released_kernel 1
 
 # Sign modules on x86.  Make sure the config files match this setting if more
 # architectures are added.
@@ -40,13 +40,13 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base,
 # which yields a base_sublevel of 0.
-%define base_sublevel 0
+%define base_sublevel 1
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
@@ -65,7 +65,7 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 8
+%define rcrev 0
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -618,8 +618,6 @@ Patch26221: drm-i915-turn-off-wc-mmaps.patch
 # CVE-2015-XXXX rhbz 1230770 1230774
 Patch26231: kvm-x86-fix-kvm_apic_has_events-to-check-for-NULL-po.patch
 
-Patch26232: mm-shmem_zero_setup-skip-security-check-and-lockdep-.patch
-
 # rhbz 1227891
 Patch26250: HID-rmi-Disable-populating-F30-when-the-touchpad-has.patch
 
@@ -1359,8 +1357,6 @@ ApplyPatch drm-i915-turn-off-wc-mmaps.patch
 # CVE-2015-XXXX rhbz 1230770 1230774
 ApplyPatch kvm-x86-fix-kvm_apic_has_events-to-check-for-NULL-po.patch
 
-ApplyPatch mm-shmem_zero_setup-skip-security-check-and-lockdep-.patch
-
 #rhbz 1227891
 ApplyPatch HID-rmi-Disable-populating-F30-when-the-touchpad-has.patch
 
@@ -2228,6 +2224,9 @@ fi
 #
 # 
 %changelog
+* Mon Jun 22 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-1
+- Linux v4.1
+
 * Thu Jun 18 2015 Josh Boyer <jwboyer@fedoraproject.org>
 - Add patch to fix touchpad issues on Razer machines (rhbz 1227891)
 
diff --git a/mm-shmem_zero_setup-skip-security-check-and-lockdep-.patch b/mm-shmem_zero_setup-skip-security-check-and-lockdep-.patch
deleted file mode 100644
index 5fba8141..00000000
--- a/mm-shmem_zero_setup-skip-security-check-and-lockdep-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Hugh Dickins <hughd@google.com>
-Date: Sun, 14 Jun 2015 09:48:09 -0700
-Subject: [PATCH] mm: shmem_zero_setup skip security check and lockdep conflict
- with XFS
-
-It appears that, at some point last year, XFS made directory handling
-changes which bring it into lockdep conflict with shmem_zero_setup():
-it is surprising that mmap() can clone an inode while holding mmap_sem,
-but that has been so for many years.
-
-Since those few lockdep traces that I've seen all implicated selinux,
-I'm hoping that we can use the __shmem_file_setup(,,,S_PRIVATE) which
-v3.13's commit c7277090927a ("security: shmem: implement kernel private
-shmem inodes") introduced to avoid LSM checks on kernel-internal inodes:
-the mmap("/dev/zero") cloned inode is indeed a kernel-internal detail.
-
-This also covers the !CONFIG_SHMEM use of ramfs to support /dev/zero
-(and MAP_SHARED|MAP_ANONYMOUS).  I thought there were also drivers
-which cloned inode in mmap(), but if so, I cannot locate them now.
-
-Reported-and-tested-by: Prarit Bhargava <prarit@redhat.com>
-Reported-by: Daniel Wagner <wagi@monom.org>
-Reported-by: Morten Stevens <mstevens@fedoraproject.org>
-Signed-off-by: Hugh Dickins <hughd@google.com>
----
- mm/shmem.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/mm/shmem.c b/mm/shmem.c
-index de981370fbc5..47d536e59fc0 100644
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -3401,7 +3401,13 @@ int shmem_zero_setup(struct vm_area_struct *vma)
- 	struct file *file;
- 	loff_t size = vma->vm_end - vma->vm_start;
- 
--	file = shmem_file_setup("dev/zero", size, vma->vm_flags);
-+	/*
-+	 * Cloning a new file under mmap_sem leads to a lock ordering conflict
-+	 * between XFS directory reading and selinux: since this file is only
-+	 * accessible to the user through its mapping, use S_PRIVATE flag to
-+	 * bypass file security, in the same way as shmem_kernel_file_setup().
-+	 */
-+	file = __shmem_file_setup("dev/zero", size, vma->vm_flags, S_PRIVATE);
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
diff --git a/sources b/sources
index 77901e19..a4597309 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-a86916bd12798220da9eb4a1eec3616d  linux-4.0.tar.xz
-d125eecce68ab6fb5f1f23523c2c04b8  perf-man-4.0.tar.gz
-9bd2e3045ff03759558a5d94a27dfdc4  patch-4.1-rc8.xz
+fe9dc0f6729f36400ea81aa41d614c37  linux-4.1.tar.xz
+5b4d0e18c713a479a7b4c1aa53a7432b  perf-man-4.1.tar.gz