summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-03-17 10:37:39 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-03-17 10:37:39 -0400
commit0a82643423645eb56b0a10f257cb8df85274a05b (patch)
tree38d09c77f7b3576fd3a0d7c51b6ba29ded402cca
parent9a8428e0a76710bd8d78da42597f25b22101eeca (diff)
downloadkernel-0a82643423645eb56b0a10f257cb8df85274a05b.tar.gz
kernel-0a82643423645eb56b0a10f257cb8df85274a05b.tar.xz
kernel-0a82643423645eb56b0a10f257cb8df85274a05b.zip
Linux v4.5-2535-g09fd671ccb24
- fbdev, media, libnvdimm, dm, scsi, ibft merges
-rw-r--r--config-generic1
-rw-r--r--gitrev2
-rw-r--r--kernel.spec6
-rw-r--r--sources2
4 files changed, 7 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index d7476288b..21e812975 100644
--- a/config-generic
+++ b/config-generic
@@ -706,7 +706,6 @@ CONFIG_DM_MULTIPATH=m
CONFIG_DM_SNAPSHOT=y
CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
CONFIG_DM_CACHE_SMQ=m
CONFIG_DM_CACHE_CLEANER=m
# CONFIG_DM_ERA is not set
diff --git a/gitrev b/gitrev
index 1ca3a1a0b..b5816afc0 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-63e30271b04c712c684c07567401b61b10d094d4
+09fd671ccb2475436bd5f597f751ca4a7d177aea
diff --git a/kernel.spec b/kernel.spec
index f847e6290..85d931b56 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
@@ -2143,6 +2143,10 @@ fi
#
#
%changelog
+* Thu Mar 17 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git7.1
+- Linux v4.5-2535-g09fd671ccb24
+- fbdev, media, libnvdimm, dm, scsi, ibft merges
+
* Thu Mar 17 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git6.1
- Linux v4.5-1822-g63e30271b04c
- PCI, PM+ACPI merges
diff --git a/sources b/sources
index c5cc87d06..8e4f60126 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz
6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz
-44758677a17a4b89b2fa3c26c8292988 patch-4.5-git6.xz
+b212237ac2571063fcdf43317dfab7c6 patch-4.5-git7.xz