summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-03-19 18:16:51 +0000
committerPeter Robinson <pbrobinson@gmail.com>2015-03-19 18:16:51 +0000
commit1b5309d39e8b3a050579e7306f8f97e16d2fcd15 (patch)
tree9ab869137c062b63162b681507417eb909ae878e /kernel.spec
parentb554910d7a1d5c737d39c99970026dc278b0049f (diff)
downloadkernel-1b5309d39e8b3a050579e7306f8f97e16d2fcd15.tar.gz
kernel-1b5309d39e8b3a050579e7306f8f97e16d2fcd15.tar.xz
kernel-1b5309d39e8b3a050579e7306f8f97e16d2fcd15.zip
Drop the big arm64 patch, just pull in the specific patches we need to fix specific problems
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec15
1 files changed, 5 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec
index c401b2fac..cc1a98f6e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -583,6 +583,7 @@ Patch15000: watchdog-Disable-watchdog-on-virtual-machines.patch
# PPC
# ARM64
+Patch21000: arm64-xgbe-a0.patch
# ARMv7
Patch21020: ARM-tegra-usb-no-reset.patch
@@ -650,9 +651,6 @@ Patch26168: HID-multitouch-add-support-of-clickpads.patch
#rhbz 1202362
Patch26169: kernfs-handle-poll-correctly-on-direct_read-files.patch
-# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
-Patch30000: kernel-arm64.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -1230,6 +1228,7 @@ ApplyPatch lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
# PPC
# ARM64
+ApplyPatch arm64-xgbe-a0.patch
#
# ARM
@@ -1408,13 +1407,6 @@ ApplyPatch HID-multitouch-add-support-of-clickpads.patch
#rhbz 1202362
ApplyPatch kernfs-handle-poll-correctly-on-direct_read-files.patch
-%if 0%{?aarch64patches}
-ApplyPatch kernel-arm64.patch
-%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
-ApplyPatch kernel-arm64.patch -R
-%endif
-%endif
-
# END OF PATCH APPLICATIONS
%endif
@@ -2265,6 +2257,9 @@ fi
#
#
%changelog
+* 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)