Merge remote-tracking branch 'origin/master' into f22-user-thl-vanilla-rawhidekernel-4.5.0-0.rc6.git3.1.vanilla.knurd.1.fc22

3 files changed, 11 insertions, 3 deletions

diff --git a/gitrev b/gitrev
index 1ca391013..c1e48a723 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-f691b77b1fc491dae601631c8531a0a13e915466
+e3c2ef41f88e50c8557270868600d3132028af3b
diff --git a/kernel.spec b/kernel.spec
index f44e0e8db..7fb57caab 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -649,6 +649,7 @@ Requires(pre): %{kernel_prereq}\
 Requires(pre): %{initrd_prereq}\
 Requires(pre): linux-firmware >= 20150904-56.git6ebf5d57\
 Requires(preun): systemd >= 200\
+Conflicts: xfsprogs < 4.3.0-1\
 Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
 %{expand:%%{?kernel%{?1:_%{1}}_conflicts:Conflicts: %%{kernel%{?1:_%{1}}_conflicts}}}\
 %{expand:%%{?kernel%{?1:_%{1}}_obsoletes:Obsoletes: %%{kernel%{?1:_%{1}}_obsoletes}}}\
@@ -2119,6 +2120,7 @@ fi
 %defattr(-,root,root)\
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
+%defverify(not mtime)\
 /usr/src/kernels/%{KVERREL}%{?2:+%{2}}\
 %{expand:%%files %{?2:%{2}-}modules-extra}\
 %defattr(-,root,root)\
@@ -2147,6 +2149,12 @@ fi
 #
 # 
 %changelog
+* Fri Mar 04 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc6.git3.1
+- Linux v4.5-rc6-41-ge3c2ef4
+
+* Thu Mar 03 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc6.git2.1
+- Linux v4.5-rc6-18-gf983cd3
+
 * Wed Mar 02 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc6.git1.1
 - Linux v4.5-rc6-8-gf691b77
 - Reenable debugging options.
diff --git a/sources b/sources
index bd6c66ed0..3ac6df493 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 9a78fa2eb6c68ca5a40ed5af08142599  linux-4.4.tar.xz
 dcbc8fe378a676d5d0dd208cf524e144  perf-man-4.4.tar.gz
 cb386089b7af5ea8eab95b5975142529  patch-4.5-rc6.xz
-47df42b4d87c1306ad9063f7ebb83152  patch-4.5-rc6-git1.xz
+70db20ea509a88291b90141d5755b57d  patch-4.5-rc6-git3.xz