summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-03-21 17:37:06 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-03-21 17:37:06 -0400
commit32ae36ddcefb8b70d0a8b9dceea3bdc853f6928e (patch)
treedc1e47a7287aa6b015139eca7ecef5ed166f798f
parent39e53b54d026d2dba4bf4d0a658db54504b69744 (diff)
downloadkernel-32ae36ddcefb8b70d0a8b9dceea3bdc853f6928e.tar.gz
kernel-32ae36ddcefb8b70d0a8b9dceea3bdc853f6928e.tar.xz
kernel-32ae36ddcefb8b70d0a8b9dceea3bdc853f6928e.zip
Linux v4.5-9714-g53d2e6976bd4
- xfs, f2fs, cgroup merges
-rw-r--r--config-generic2
-rw-r--r--gitrev2
-rw-r--r--kernel.spec6
-rw-r--r--sources2
4 files changed, 9 insertions, 3 deletions
diff --git a/config-generic b/config-generic
index e98aa34df..3dea9996e 100644
--- a/config-generic
+++ b/config-generic
@@ -4511,6 +4511,8 @@ CONFIG_MFD_VIPERBOARD=m
#
CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_FS_ENCRYPTION is not set
+
# ext4 is used for ext2 and ext3 filesystems
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
diff --git a/gitrev b/gitrev
index 7407fe47c..6ec176356 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-643ad15d47410d37d43daf3ef1c8ac52c281efa5
+53d2e6976bd4042672ed7b90dfbf4b31635b7dcf
diff --git a/kernel.spec b/kernel.spec
index b9e365d3e..6c86abf4a 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 16
+%define gitrev 17
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2160,6 +2160,10 @@ fi
#
#
%changelog
+* Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git17.1
+- Linux v4.5-9714-g53d2e6976bd4
+- xfs, f2fs, cgroup merges
+
* Mon Mar 21 2016 Laura Abbott <labbott@fedoraproject.org>
- uas: Limit qdepth at the scsi-host level (rhbz 1315013)
- Fix for performance regression caused by thermal (rhbz 1317190)
diff --git a/sources b/sources
index e2678214a..8e815fc4c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz
6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz
-f2cc9fe3fd4714d257fb93957d7ca7bb patch-4.5-git16.xz
+ad9608d5d9af9dbd329de4d42193d5f9 patch-4.5-git17.xz