fix merge errors

1 files changed, 2 insertions, 786 deletions

diff --git a/kernel.spec b/kernel.spec
index 2249b4645..4f3ca3e84 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,11 +54,11 @@ Summary: The Linux kernel
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
+# Is it a -stable RC
+%define stable_rc 0
 
 # Do we have a -stable update to apply?
 %define stable_update 0
-# Is it a -stable RC?
-%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -3919,790 +3919,6 @@ fi
 * Mon Apr 27 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc1.git0.1
 - Linux v4.1-rc1
 - Disable debugging options.
-<<<<<<< HEAD
-
-* Fri Apr 24 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git14.1
-- Linux v4.0-10976-gd56a669ca59c
-
-* Fri Apr 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix iscsi with QNAP devices (rhbz 1208999)
-
-* Thu Apr 23 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git13.1
-- Linux v4.0-10710-g27cf3a16b253
-
-* Wed Apr 22 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update AMD xgbe a0 aarch64 driver for 4.1
-
-* Wed Apr 22 2015 Peter Robinson <pbrobinson@fedoraproject.org> - 4.1.0-0.rc0.git12.1
-- Inital ARM updates for 4.1
-- Temporarily disable AMD ARM64 xgbe-a0 driver
-
-* Wed Apr 22 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Linux v4.0-9804-gdb4fd9c5d072
-
-* Tue Apr 21 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git11.1
-- Linux v4.0-9362-g1fc149933fd4
-
-* Tue Apr 21 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable ECHO driver (rhbz 749884)
-
-* Mon Apr 20 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git10.1
-- Linux v4.0-8962-g14aa02449064
-- DRM merge
-
-* Mon Apr 20 2015 Dennis Gilmore <dennis@ausil.us>
-- enable mvebu for the LPAE kernel
-
-* Mon Apr 20 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git9.1
-- Linux v4.0-8158-g09d51602cf84
-
-* Sat Apr 18 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git8.1
-- Linux v4.0-7945-g7505256626b0
-
-* Fri Apr 17 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git7.1
-- Linux v4.0-7300-g4fc8adcfec3d
-- Patch from Benjamin Tissoires to fix 3 finger tap on synaptics (rhbz 1212230)
-- Add patch to support touchpad on Google Pixel 2 (rhbz 1209088)
-
-* Fri Apr 17 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git6.1
-- Linux v4.0-7209-g7d69cff26cea
-
-* Thu Apr 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git5.1
-- Linux v4.0-7084-g497a5df7bf6f
-
-* Thu Apr 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git4.1
-- Linux v4.0-6817-geea3a00264cf
-
-* Wed Apr 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git3.1
-- Linux v4.0-5833-g6c373ca89399
-
-* Wed Apr 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git2.1
-- Linux v4.0-3843-gbb0fd7ab0986
-
-* Tue Apr 14 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git1.1
-- Linux v4.0-2620-gb79013b2449c
-- Reenable debugging options.
-
-* Sun Apr 12 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-1
-- Linux v4.0
-
-* Fri Apr 10 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc7.git2.1
-- Linux v4.0-rc7-42-ge5e02de0665e
-
-* Thu Apr 09 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc7.git1.1
-- Linux v4.0-rc7-30-g20624d17963c
-
-* Thu Apr 02 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc6.git2.1
-- Linux v4.0-rc6-101-g0a4812798fae
-
-* Thu Apr 02 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- DoS against IPv6 stacks due to improper handling of RA (rhbz 1203712 1208491)
-
-* Wed Apr 01 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc6.git1.1
-- Linux v4.0-rc6-31-gd4039314d0b1
-- CVE-2015-2150 xen: NMIs triggerable by guests (rhbz 1196266 1200397)
-
-* Tue Mar 31 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable MLX4_EN_VXLAN (rhbz 1207728)
-
-* Mon Mar 30 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc6.git0.1
-- Linux v4.0-rc6
-
-* Fri Mar 27 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git4.1
-- Linux v4.0-rc5-96-g3c435c1e472b
-- Fixes hangs due to i915 issues (rhbz 1204050 1206056)
-
-* Thu Mar 26 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git3.1
-- Linux v4.0-rc5-80-g4c4fe4c24782
-
-* Wed Mar 25 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- Add aarch64 patches to fix mustang usb, seattle eth, and console settings
-
-* Wed Mar 25 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git2.4
-- Add patches to fix a few more i915 hangs/oopses
-
-* Wed Mar 25 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git2.1
-- Linux v4.0-rc5-53-gc875f421097a
-
-* Tue Mar 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix ALPS v5 and v7 trackpads (rhbz 1203584)
-
-* Tue Mar 24 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git1.3
-- Linux v4.0-rc5-25-g90a5a895cc8b
-- Add some i915 fixes
-
-* Mon Mar 23 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git0.3
-- Enable CONFIG_SND_BEBOB (rhbz 1204342)
-- Validate iovec range in sys_sendto/sys_recvfrom
-- Revert i915 commit that causes boot hangs on at least some headless machines
-- Linux v4.0-rc5
-
-* Fri Mar 20 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc4.git2.1
-- Linux v4.0-rc4-199-gb314acaccd7e
-- Fix brightness on Lenovo Ideapad Z570 (rhbz 1187004)
-
-* Thu Mar 19 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc4.git1.3
-- Linux v4.0-rc4-88-g7b09ac704bac
-- Rename arm64-xgbe-a0.patch
-
-* Thu Mar 19 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- Drop arm64 non upstream patch
-
-* Thu Mar 19 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to fix high cpu usage on direct_read kernfs files (rhbz 1202362)
-
-* Wed Mar 18 2015 Jarod Wilson <jwilson@fedoraproject.org>
-- Fix kernel-uname-r Requires/Provides variant mismatches
-
-* Tue Mar 17 2015 Kyle McMartin <kmcmarti@redhat.com> - 4.0.0-0.rc4.git0.3
-- Update kernel-arm64.patch, move EDAC to arm-generic, add EDAC_XGENE on arm64.
-- Add PCI_ECAM on generic, since it'll be selected most places anyway.
-
-* Mon Mar 16 2015 Jarod Wilson <jwilson@fedoraproject.org>
-- Fix bad variant usage in kernel dependencies
-
-* Mon Mar 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc4.git0.1
-- Linux v4.0-rc4
-- Drop arm64 RCU revert patch.  Should be fixed properly upstream now.
-- Disable debugging options.
-
-* Sun Mar 15 2015 Jarod Wilson <jwilson@fedoraproject.org>
-- Fix kernel-tools sub-packages for variant builds
-
-* Fri Mar 13 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix esrt build on aarch64
-
-* Fri Mar 13 2015 Kyle McMartin <kyle@fedoraproject.org>
-- arm64-revert-tlb-rcu_table_free.patch: revert 5e5f6dc1 which
-  causes lockups on arm64 machines.
-- Also revert ESRT on AArch64 for now.
-
-* Fri Mar 13 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc3.git2.1
-- Linux v4.0-rc3-148-gc202baf017ae
-- Add patch to support clickpads (rhbz 1201532)
-
-* Thu Mar 12 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- CVE-2014-8159 infiniband: uverbs: unprotected physical memory access (rhbz 1181166 1200950)
-
-* Wed Mar 11 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc3.git1.1
-- Linux v4.0-rc3-111-gaffb8172de39
-- CVE-2015-2150 xen: NMIs triggerable by guests (rhbz 1196266 1200397)
-- Patch series to fix Lenovo *40 and Carbon X1 touchpads (rhbz 1200777 1200778)
-- Revert commit that added bad rpath to cpupower (rhbz 1199312)
-- Reenable debugging options.
-
-* Mon Mar 09 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc3.git0.1
-- Linux v4.0-rc3
-- Disable debugging options.
-
-* Sun Mar  8 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- ARMv7: add patches to fix crash on boot for some devices on multiplatform
-
-* Fri Mar 06 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc2.git2.1
-- Linux v4.0-rc2-255-g5f237425f352
-
-* Thu Mar 05 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc2.git1.1
-- Linux v4.0-rc2-150-g6587457b4b3d
-- Reenable debugging options.
-
-* Wed Mar 04 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable MLX4_EN on ppc64/aarch64 (rhbz 1198719)
-
-* Tue Mar 03 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc2.git0.1
-- Linux v4.0-rc2
-- Enable CONFIG_CM32181 for ALS on Carbon X1
-- Disable debugging options.
-
-* Tue Mar 03 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc1.git3.1
-- Linux v4.0-rc1-178-g023a6007a08d
-
-* Mon Mar 02 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to fix nfsd soft lockup (rhbz 1185519)
-- Enable ET131X driver (rhbz 1197842)
-- Enable YAMA (rhbz 1196825)
-
-* Sat Feb 28 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- ARMv7 OMAP updates, fix panda boot
-
-* Fri Feb 27 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc1.git2.1
-- Linux v4.0-rc1-36-g4f671fe2f952
-
-* Wed Feb 25 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Add support for AR5B195 devices from Alexander Ploumistos (rhbz 1190947)
-
-* Tue Feb 24 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc1.git1.1
-- Linux v4.0-rc1-22-gb24e2bdde4af
-- Reenable debugging options.
-
-* Tue Feb 24 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.0-0.rc1.git0.2
-- Add patch to fix aarch64 KVM bug with module loading (rhbz 1194366).
-
-* Tue Feb 24 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config update
-
-* Mon Feb 23 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc1.git0.1
-- Add patch for HID i2c from Seth Forshee (rhbz 1188439)
-
-* Mon Feb 23 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Linux v4.0-rc1
-- CVE-2015-0275 ext4: fallocate zero range page size > block size BUG (rhbz 1193907 1195178)
-- Disable debugging options.
-
-* Fri Feb 20 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git10.1
-- Linux v3.19-8975-g3d883483dc0a
-- Add patch to fix intermittent hangs in nouveau driver
-- Move mtpspi and related mods to kernel-core for VMWare guests (rhbz 1194612)
-
-* Wed Feb 18 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git9.1
-- Linux v3.19-8784-gb2b89ebfc0f0
-
-* Wed Feb 18 2015 Kyle McMartin <kyle@fedoraproject.org> - 3.20.0-0.rc0.git8.2
-- kernel-arm64.patch: Revert dropping some of the xgene fixes we carried
-  against upstream. (#1193875)
-- kernel-arm64-fix-psci-when-pg.patch: make it simpler.
-- config-arm64: turn on CONFIG_DEBUG_SECTION_MISMATCH.
-
-* Wed Feb 18 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git8.1
-- Linux v3.19-8217-gcc4f9c2a91b7
-
-* Tue Feb 17 2015 Kyle McMartin <kyle@fedoraproject.org> - 3.20.0-0.rc0.git7.3
-- kernel-arm64.patch turned on.
-
-* Tue Feb 17 2015 Kyle McMartin <kyle@fedoraproject.org> - 3.20.0-0.rc0.git7.2
-- kernel-arm64.patch merge, but leave it off.
-- kernel-arm64-fix-psci-when-pg.patch: when -pg (because of ftrace) is enabled
-  we must explicitly annotate which registers should be assigned, otherwise
-  gcc will do unexpected things behind our backs.
-
-* Tue Feb 17 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git7.1
-- Linux v3.19-7478-g796e1c55717e
-- DRM merge
-
-* Mon Feb 16 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- CVE-XXXX-XXXX potential memory corruption in vhost/scsi driver (rhbz 1189864 1192079)
-- CVE-2015-1593 stack ASLR integer overflow (rhbz 1192519 1192520)
-
-* Mon Feb 16 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor updates for ARMv7/ARM64
-
-* Mon Feb 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git6.1
-- Linux v3.19-6676-g1fa185ebcbce
-
-* Fri Feb 13 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git5.1
-- Linux v3.19-5015-gc7d7b9867155
-
-* Thu Feb 12 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git4.1
-- Linux v3.19-4542-g8cc748aa76c9
-
-* Thu Feb 12 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git3.1
-- Linux v3.19-4020-gce01e871a1d4
-
-* Wed Feb 11 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git2.1
-- Linux v3.19-2595-gc5ce28df0e7c
-
-* Wed Feb 11 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git1.1
-- Linux v3.19-463-g3e8c04eb1174
-- Reenable debugging options.
-- Temporarily disable aarch64 patches
-
-* Mon Feb 09 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-1
-- Linux v3.19
-
-* Sat Feb 07 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc7.git3.1
-- Linux v3.19-rc7-189-g26cdd1f76a88
-
-* Thu Feb  5 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- Allwinner A23 (sun8i) SoC
-- Move ARM usb platform options to arm-generic
-
-* Thu Feb 05 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc7.git2.1
-- Linux v3.19-rc7-32-g5ee0e962603e
-
-* Wed Feb 04 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc7.git1.1
-- Linux v3.19-rc7-22-gdc6d6844111d
-
-* Tue Feb 03 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc7.git0.3
-- Add patch to fix NFS backtrace (rhbz 1188638)
-
-* Mon Feb 02 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc7.git0.1
-- Linux v3.19-rc7
-- Disable debugging options.
-
-* Fri Jan 30 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc6.git3.1
-- Linux v3.19-rc6-142-g1c999c47a9f1
-
-* Thu Jan 29 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Backport patch from Rob Clark to toggle i915 state machine checks
-
-* Thu Jan 29 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- More ARMv7 updates
-- A few more sound config cleanups
-
-* Wed Jan 28 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc6.git2.1
-- Linux v3.19-rc6-105-gc59c961ca511
-
-* Tue Jan 27 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable SND_SOC and the button array driver on x86 for Baytrail devices
-
-* Tue Jan 27 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc6.git1.1
-- Linux v3.19-rc6-21-g4adca1cbc4ce
-- Reenable debugging options.
-
-* Mon Jan 26 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc6.git0.1
-- Linux v3.19-rc6
-- Remove symbolic link hunk from patch-3.19-rc6 (rbhz 1185928)
-- Disable debugging options.
-
-* Thu Jan 22 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc5.git2.1
-- Linux v3.19-rc5-134-gf8de05ca38b7
-
-* Wed Jan 21 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc5.git1.1
-- Linux v3.19-rc5-117-g5eb11d6b3f55
-- Reenable debugging options.
-
-* Tue Jan 20 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- More ARM config option cleanups
-
-* Mon Jan 19 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc5.git0.1
-- Linux v3.19-rc5
-- Disable debugging options.
-
-* Sat Jan 17 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- Move Rockchip to ARMv7 generic to support rk32xx on LPAE
-- Enable Device Tree Overlays for dynamic DTB
-- ARM config updates
-
-* Fri Jan 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc4.git4.1
-- Linux v3.19-rc4-155-gcb59670870d9
-
-* Thu Jan 15 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Re-enable BUILD_DOCSRC
-
-* Thu Jan 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc4.git3.1
-- Linux v3.19-rc4-141-gf800c25b7a76
-
-* Wed Jan 14 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc4.git2.1
-- Linux v3.19-rc4-46-g188c901941ef
-- Enable I40E_VXLAN (rhbz 1182116)
-
-* Tue Jan 13 2015 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable Checkpoint/Restore on ARMv7 (rhbz 1146995)
-
-* Tue Jan 13 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Add installonlypkg(kernel) to kernel-devel subpackages (rhbz 1079906)
-
-* Tue Jan 13 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc4.git1.1
-- Linux v3.19-rc4-23-g971780b70194
-- Reenable debugging options.
-
-* Mon Jan 12 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc4.git0.1
-- Linux v3.19-rc4
-- Disable debugging options.
-
-* Mon Jan 12 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Backlight fixes for Samsung and Dell machines (rhbz 1094948 1115713)
-- Add various UAS quirks (rhbz 1124119)
-- Add patch to fix loop in VDSO (rhbz 1178975)
-
-* Fri Jan 09 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc3.git2.1
-- Linux v3.19-rc3-69-g11c8f01b423b
-
-* Wed Jan 07 2015 Kyle McMartin <kyle@fedoraproject.org> - 3.19.0-0.rc3.git1.2
-- kernel-arm64.patch: fix up build... no idea if it works.
-
-* Wed Jan 07 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- CVE-2014-9529 memory corruption or panic during key gc (rhbz 1179813 1179853)
-
-* Wed Jan 07 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc3.git1.1
-- Linux v3.19-rc3-38-gbdec41963890
-- Enable POWERCAP and INTEL_RAPL options
-- Reenable debugging options.
-
-* Tue Jan 06 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Linux v3.19-rc3
-
-* Mon Jan 05 2015 Josh Boyer <jwboyer@fedoraproject.org>
-- Linux v3.19-rc2
-- Temporarily disable aarch64patches
-- Happy New Year
-
-* Sun Dec 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable F2FS (rhbz 972446)
-
-* Thu Dec 18 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.1-2
-- CVE-2014-8989 userns can bypass group restrictions (rhbz 1170684 1170688)
-- Fix from Kyle McMartin for target_core_user uapi issue since it's enabled
-- Fix dm-cache crash (rhbz 1168434)
-- Fix blk-mq crash on CPU hotplug (rhbz 1175261)
-
-* Wed Dec 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.1-1
-- Linux v3.18.1
-- CVE-2014-XXXX isofs: infinite loop in CE record entries (rhbz 1175235 1175250)
-- Enable TCM_USER (rhbz 1174986)
-- Enable USBIP in modules-extra from Johnathan Dieter (rhbz 1169478)
-
-* Tue Dec 16 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-2
-- Add patch from Josh Stone to restore var-tracking via Kconfig (rhbz 1126580)
-
-* Mon Dec 15 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix ppc64 boot with smt-enabled=off (rhbz 1173806)
-- CVE-2014-8133 x86: espfix(64) bypass via set_thread_area and CLONE_SETTLS (rhbz 1172797 1174374)
-- CVE-2014-8559 deadlock due to incorrect usage of rename_lock (rhbz 1159313 1173814)
-
-* Fri Dec 12 2014 Kyle McMartin <kyle@fedoraproject.org>
-- build in ahci_platform on aarch64 temporarily.
-
-* Fri Dec 12 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Remove pointless warning in cfg80211 (rhbz 1172543)
-
-* Thu Dec 11 2014 Kyle McMartin <kyle@fedoraproject.org>
-- kernel-arm64.patch: update from git.
-
-* Wed Dec 10 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix UAS crashes with Seagate and Fresco Logic drives (rhbz 1164945)
-- CVE-2014-8134 fix espfix for 32-bit KVM paravirt guests (rhbz 1172765 1172769)
-
-* Tue Dec 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-1
-- Linux v3.18
-
-* Fri Dec 05 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc7.git3.1
-- Linux v3.18-rc7-59-g56c67ce187a8
-
-* Thu Dec 04 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc7.git2.1
-- Linux v3.18-rc7-48-g7cc78f8fa02c
-
-* Wed Dec 03 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc7.git1.1
-- Linux v3.18-rc7-3-g3a18ca061311
-
-* Mon Dec 01 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc7.git0.1
-- Linux v3.18-rc7
-
-* Thu Nov 27 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc6.git1.1
-- Linux v3.18-rc6-28-g3314bf6ba2ac
-- Gobble Gobble
-
-* Mon Nov 24 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Linux v3.18-rc6
-- Add quirk for Laser Mouse 6000 (rhbz 1165206)
-
-* Fri Nov 21 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Move TPM drivers to main kernel package (rhbz 1164937)
-
-* Wed Nov 19 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Disable SERIAL_8250 on s390x (rhbz 1158848)
-
-* Mon Nov 17 2014 Kyle McMartin <kyle@fedoraproject.org> - 3.18.0-0.rc5.git0.2
-- Re-merge kernel-arm64.patch
-
-* Mon Nov 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc5.git0.1
-- Linux v3.18-rc5
-- Disable debugging options.
-
-* Fri Nov 14 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable I40EVF driver (rhbz 1164029)
-
-* Fri Nov 14 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc4.git2.1
-- Linux v3.18-rc4-184-gb23dc5a7cc6e
-
-* Thu Nov 13 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch for MS Surface Pro 3 Type Cover (rhbz 1135338)
-- CVE-2014-7843 aarch64: copying from /dev/zero causes local DoS (rhbz 1163744 1163745)
-
-* Thu Nov 13 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc4.git1.1
-- Linux v3.18-rc4-52-g04689e749b7e
-- Reenable debugging options.
-
-* Wed Nov 12 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- CVE-2014-7841 sctp: NULL ptr deref on malformed packet (rhbz 1163087 1163095)
-
-* Tue Nov 11 2014 Kyle McMartin <kyle@fedoraproject.org> - 3.18.0-0.rc4.git0.2
-- Re-enable kernel-arm64.patch, and fix up merge conflicts with 3.18-rc4
-
-* Mon Nov 10 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix Samsung pci-e SSD handling on some macbooks (rhbz 1161805)
-
-* Mon Nov 10 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc4.git0.1
-- Linux v3.18-rc4
-- Temporarily disable aarch64patches
-- Disable debugging options.
-
-* Fri Nov 07 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc3.git4.1
-- Linux v3.18-rc3-82-ged78bb846e8b
-
-* Thu Nov 06 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc3.git3.1
-- Linux v3.18-rc3-68-g20f3963d8f48
-
-* Wed Nov 05 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc3.git2.1
-- Linux v3.18-rc3-61-ga1cff6e25e6e
-
-* Tue Nov 04 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc3.git1.1
-- Linux v3.18-rc3-31-g980d0d51b1c9
-- Reenable debugging options.
-
-* Mon Nov 03 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable CONFIG_KXCJK1013
-- Add driver for goodix touchscreen from Bastien Nocera
-
-* Mon Nov 03 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc3.git0.1
-- Linux v3.18-rc3
-- Disable debugging options.
-
-* Thu Oct 30 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc2.git3.1
-- Linux v3.18-rc2-106-ga7ca10f263d7
-
-* Wed Oct 29 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc2.git2.1
-- Linux v3.18-rc2-53-g9f76628da20f
-
-* Tue Oct 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Add quirk for rfkill on Yoga 3 machines (rhbz 1157327)
-
-* Tue Oct 28 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc2.git1.1
-- Linux v3.18-rc2-43-gf7e87a44ef60
-- Add two RCU patches to fix a deadlock and a hang
-- Reenable debugging options.
-
-* Mon Oct 27 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc2.git0.1
-- Linux v3.18-rc2
-- Disable debugging options.
-
-* Sun Oct 26 2014 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update ARM config options, some minor cleanups
-
-* Sun Oct 26 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git4.1
-- Linux v3.18-rc1-422-g2cc91884b6b3
-
-* Fri Oct 24 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git3.3
-- CVE-2014-3610 kvm: noncanonical MSR writes (rhbz 1144883 1156543)
-- CVE-2014-3611 kvm: PIT timer race condition (rhbz 1144878 1156537)
-- CVE-2014-3646 kvm: vmx: invvpid vm exit not handled (rhbz 1144825 1156534)
-- CVE-2014-8369 kvm: excessive pages un-pinning in kvm_iommu_map error path (rhbz 1156518 1156522)
-- CVE-2014-8480 CVE-2014-8481 kvm: NULL pointer dereference during rip relative instruction emulation (rhbz 1156615 1156616)
-
-* Fri Oct 24 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git3.1
-- Linux v3.18-rc1-280-g816fb4175c29
-- Add touchpad quirk for Fujitsu Lifebook A544/AH544 models (rhbz 1111138)
-
-* Wed Oct 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git2.1
-- Linux v3.18-rc1-221-gc3351dfabf5c
-- Add patch to fix wifi on X550VB machines (rhbz 1089731)
-
-* Tue Oct 21 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Drop pinctrl qcom revert now that it's dependencies should be merged
-
-* Tue Oct 21 2014 Kyle McMartin <kyle@fedoraproject.org> - 3.18.0-0.rc1.git1.2
-- Re-enable kernel-arm64.patch after updating.
-- CONFIG_SERIAL_8250_FINTEK moved to generic since it appears on x86-generic
-  and arm64 now.
-- CONFIG_IMX_THERMAL=n added to config-arm64.
-- arm64: disable BPF_JIT temporarily
-
-* Tue Oct 21 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git1.1
-- Linux v3.18-rc1-68-gc2661b806092
-- Make LOG_BUF_SHIFT on arm64 the same as the rest of the arches (rhbz 1123327)
-- Enable RTC PL031 driver on arm64 (rhbz 1123882)
-- Reenable debugging options.
-
-* Mon Oct 20 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git0.1
-- Linux v3.18-rc1
-- Disable debugging options.
-
-* Fri Oct 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git9.4
-- CVE-2014-8086 ext4: race condition (rhbz 1151353 1152608)
-- Enable B43_PHY_G to fix b43 driver regression (rhbz 1152502)
-
-* Wed Oct 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git9.3
-- Revert Btrfs ro snapshot commit that causes filesystem corruption
-
-* Wed Oct 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git9.1
-- Linux v3.17-9670-g0429fbc0bdc2
-
-* Tue Oct 14 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patches to fix elantech touchscreens (rhbz 1149509)
-
-* Tue Oct 14 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git8.1
-- Linux v3.17-9283-g2d65a9f48fcd
-
-* Tue Oct 14 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git7.1
-- Linux v3.17-8307-gf1d0d14120a8
-
-* Mon Oct 13 2014 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update armv7/aarch64 config options
-
-* Mon Oct 13 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git6.1
-- Linux v3.17-7872-g5ff0b9e1a1da
-
-* Sun Oct 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git5.1
-- Linux v3.17-7639-g90eac7eee2f4
-
-* Sun Oct 12 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable CONFIG_I2C_DESIGNWARE_PCI (rhbz 1045821)
-
-* Fri Oct 10 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- CVE-2014-7970 VFS: DoS with USER_NS (rhbz 1151095 1151484)
-
-* Fri Oct 10 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git4.1
-- Linux v3.17-6136-gc798360cd143
-
-* Thu Oct 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git3.1
-- Linux v3.17-5585-g782d59c5dfc5
-
-* Thu Oct 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git2.1
-- Linux v3.17-5503-g35a9ad8af0bb
-
-* Wed Oct 08 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git1.1
-- Linux v3.17-2860-gef0625b70dac
-- Reenable debugging options.
-- Temporarily disable aarch64patches
-- Add patch to fix ATA blacklist
-
-* Tue Oct 07 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to fix GFS2 regression (from Bob Peterson)
-
-* Mon Oct 06 2014 Kyle McMartin <kyle@fedoraproject.org>
-- enable 64K pages on arm64... (presently) needed to boot on amd seattle
-  platforms due to physical memory being unreachable.
-
-* Mon Oct 06 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-1
-- Linux v3.17
-
-* Fri Oct 03 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc7.git3.1
-- Linux v3.17-rc7-76-g58586869599f
-- Various ppc64/ppc64le config changes
-
-* Thu Oct 02 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc7.git2.1
-- Linux v3.17-rc7-46-g50dddff3cb9a
-- Cleanup dead Kconfig symbols in config-* from Paul Bolle
-
-* Wed Oct 01 2014 Kyle McMartin <kyle@fedoraproject.org>
-- Update kernel-arm64.patch from git, again... enable AMD_XGBE on arm64.
-
-* Wed Oct 01 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc7.git1.1
-- Linux v3.17-rc7-6-gaad7fb916a10
-
-* Tue Sep 30 2014 Kyle McMartin <kyle@fedoraproject.org> - 3.17.0-0.rc7.git0.2
-- Revert some v3.16 changes to mach-highbank which broke L2 cache enablement.
-  Will debug upstream separately, but we need F22/21 running there. (#1139762)
-
-* Tue Sep 30 2014 Peter Robinson <pbrobinson@fedoraproject.org>
-- Don't build Exynos4 on lpae kernel
-- Add dts for BananaPi
-- Minor ARM updates
-- Build 6lowpan modules
-
-* Mon Sep 29 2014 Kyle McMartin <kyle@fedoraproject.org>
-- Update kernel-arm64.patch from git.
-
-* Mon Sep 29 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc7.git0.1
-- Linux v3.17-rc7
-
-* Wed Sep 24 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc6.git2.1
-- Linux v3.17-rc6-180-g452b6361c4d9
-
-* Tue Sep 23 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix return code when adding keys (rhbz 1145318)
-- Add patch to fix XPS 13 touchpad issue (rhbz 1123584)
-
-* Tue Sep 23 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc6.git1.1
-- Linux v3.17-rc6-125-gf3670394c29f
-
-* Mon Sep 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc6.git0.1
-- Linux v3.17-rc6
-- Revert EFI GOT fixes as it causes boot failures
-- Disable debugging options.
-
-* Fri Sep 19 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git5.1
-- Linux v3.17-rc5-105-g598a0c7d0932
-
-* Fri Sep 19 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Disable NO_HZ_FULL again
-- Enable early microcode loading (rhbz 1083716)
-
-* Fri Sep 19 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git4.1
-- Linux v3.17-rc5-63-gd9773ceabfaf
-- Enable infiniband on s390x
-
-* Thu Sep 18 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git3.1
-- Linux v3.17-rc5-25-g8ba4caf1ee15
-
-* Wed Sep 17 2014 Kyle McMartin <kyle@fedoraproject.org>
-- I also like to live dangerously. (Re-enable RCU_FAST_NO_HZ which has been off
-  since April 2012. Also enable NO_HZ_FULL on x86_64.)
-- I added zipped modules ages ago, remove it from TODO.
-
-* Wed Sep 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git2.1
-- Linux v3.17-rc5-24-g37504a3be90b
-- Fix vmwgfx header include (rhbz 1138759)
-
-* Tue Sep 16 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git1.1
-- Linux v3.17-rc5-13-g2324067fa9a4
-- Reenable debugging options.
-
-* Mon Sep 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git0.1
-- Linux v3.17-rc5
-- Disable debugging options.
-
-* Fri Sep 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git4.1
-- Linux v3.17-rc4-244-g5874cfed0b04
-
-* Thu Sep 11 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable ACPI_I2C_OPREGION
-
-* Thu Sep 11 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git3.1
-- Linux v3.17-rc4-168-g7ec62d421bdf
-- Add support for touchpad in Asus X450 and X550 (rhbz 1110011)
-
-* Wed Sep 10 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git2.1
-- Linux v3.17-rc4-158-ge874a5fe3efa
-- Add patch to fix oops on keyring gc (rhbz 1116347)
-
-* Tue Sep 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git1.1
-- Linux v3.17-rc4-140-g8c68face5548
-- Reenable debugging options.
-
-* Mon Sep 08 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Remove ppc32 support
-
-* Mon Sep  8 2014 Peter Robinson <pbrobinson@fedoraproject.org>
-- Build tools on ppc64le (rhbz 1138884)
-- Some minor ppc64 cleanups
-
-* Mon Sep 08 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git0.1
-- Linux v3.17-rc4
-- Disable debugging options.
-
-* Fri Sep 05 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc3.git3.1
-- Linux v3.17-rc3-94-gb7fece1be8b1
-
-* Thu Sep 04 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc3.git2.1
-- Linux v3.17-rc3-63-g44bf091f5089
-- Enable kexec bzImage signature verification (from Vivek Goyal)
-- Add support for Wacom Cintiq Companion from Benjamin Tissoires (rhbz 1134969)
-
-* Wed Sep 03 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc3.git1.1
-- Linux v3.17-rc3-16-g955837d8f50e
-- Reenable debugging options.
-
-* Tue Sep 02 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Remove with_extra switch
-
-* Mon Sep 01 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc3.git0.1
-- Linux v3.17-rc3
-- Disable debugging options.
-
-* Fri Aug 29 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc2.git3.1
-- Linux v3.17-rc2-89-g59753a805499
-
-* Thu Aug 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix NFSv3 ACL regression (rhbz 1132786)
-
-* Thu Aug 28 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc2.git2.1
-- Linux v3.17-rc2-42-gf1bd473f95e0
-- Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160)
-
-* Wed Aug 27 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc2.git1.1
-- Disable streams on via XHCI (rhbz 1132666)
-- Linux v3.17-rc2-9-g68e370289c29
-- Reenable debugging options.
 
 * Sat Oct 20 2012 Thorsten Leemhuis <fedora@leemhuis.info> - 3.7.0-0.rc1.git3.1.vanilla.mainline.knurd.1
 - add buildid ".vanilla.knurd.1"