From 519148ae7bf448f47e4481acebe747e48e224bd6 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 4 Mar 2016 11:32:21 -0600 Subject: [PATCH] Linux v4.5-rc6-41-ge3c2ef4 --- gitrev | 2 +- kernel.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index 7928f40e9..c1e48a723 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -f983cd32cd5d2ec47ac8868f387bad15e8f11f85 +e3c2ef41f88e50c8557270868600d3132028af3b diff --git a/kernel.spec b/kernel.spec index 33bab8dd2..4c5c5aa37 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -630,6 +630,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}}}\ @@ -2126,6 +2127,9 @@ fi # # %changelog +* Fri Mar 04 2016 Justin M. Forbes - 4.5.0-0.rc6.git3.1 +- Linux v4.5-rc6-41-ge3c2ef4 + * Thu Mar 03 2016 Justin M. Forbes - 4.5.0-0.rc6.git2.1 - Linux v4.5-rc6-18-gf983cd3 diff --git a/sources b/sources index fac4e2582..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 -d24ae7d8a2cbfecd76f8c78b53c2043a patch-4.5-rc6-git2.xz +70db20ea509a88291b90141d5755b57d patch-4.5-rc6-git3.xz