diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-02-13 08:02:25 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-02-13 08:02:25 +0100 |
| commit | 4e0c48671ebce0d6bca0e6d76cfb8691b94d4253 (patch) | |
| tree | 4b61a14af80f23ba1016b92a65cdcdd66e3302e8 /kernel.spec | |
| parent | 506529efe75c548b1705235bd91f49f034dd2bd7 (diff) | |
| parent | e1dd49dd9281912711017fd815079f03306cb305 (diff) | |
| download | kernel-4e0c48671ebce0d6bca0e6d76cfb8691b94d4253.tar.gz kernel-4e0c48671ebce0d6bca0e6d76cfb8691b94d4253.tar.xz kernel-4e0c48671ebce0d6bca0e6d76cfb8691b94d4253.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.5.0-0.rc3.git3.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 411d352dc..d85b298ea 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,7 +75,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 3 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -615,6 +615,9 @@ Patch645: cfg80211-wext-fix-message-ordering.patch #rhbz 1255325 Patch646: HID-sony-do-not-bail-out-when-the-sixaxis-refuses-th.patch +#rhbz 1288684 +Patch647: 0001-vsock-Fix-blocking-ops-call-in-prepare_to_wait.patch + # END OF PATCH DEFINITIONS %endif @@ -2089,6 +2092,12 @@ fi # # %changelog +* Fri Feb 12 2016 Laura Abbott <labbott@fedoraproject.org> +- Fix warning spew from vmware sockets (rhbz 1288684) + +* Fri Feb 12 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc3.git3.1 +- Linux v4.5-rc3-83-gc05235d + * Thu Feb 11 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc3.git2.1 - Linux v4.5-rc3-57-g721675f |