summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-07-01 12:11:35 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-07-01 12:11:35 -0400
commit55b5c15b8f0c65f111c9fb61b839024d0502798c (patch)
tree4407279923a3f4501f8ea851d17e2ca68c9430a0
parent6a50f368784f29b0772f265a05b9e395bb2c23ff (diff)
downloadkernel-55b5c15b8f0c65f111c9fb61b839024d0502798c.tar.gz
kernel-55b5c15b8f0c65f111c9fb61b839024d0502798c.tar.xz
kernel-55b5c15b8f0c65f111c9fb61b839024d0502798c.zip
Linux v4.1-11549-g05a8256c586a
-rw-r--r--config-generic1
-rw-r--r--kernel.spec5
-rw-r--r--sources2
3 files changed, 6 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index 8cfe42350..ccba5674d 100644
--- a/config-generic
+++ b/config-generic
@@ -4401,6 +4401,7 @@ CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
CONFIG_CIFS_SMB2=y
+# CONFIG_CIFS_SMB311 is not set
CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
diff --git a/kernel.spec b/kernel.spec
index 4dbfbec88..e389d0f44 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 3
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2135,6 +2135,9 @@ fi
#
#
%changelog
+* Wed Jul 01 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-0.rc0.git4.1
+- Linux v4.1-11549-g05a8256c586a
+
* Tue Jun 30 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-0.rc0.git3.1
- Linux v4.1-11355-g6aaf0da8728c
- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143)
diff --git a/sources b/sources
index 4abaa67b8..955d78f19 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
fe9dc0f6729f36400ea81aa41d614c37 linux-4.1.tar.xz
84e34c2f58901edcc5c840fe9893c02e perf-man-4.1.tar.gz
-0c5c3ccf288263f7810cecd57de73432 patch-4.1-git3.xz
+2736bd5697920e855c5562efc1f8b8db patch-4.1-git4.xz