Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail
This commit is contained in:
commit
bb5d04d2ed
61 changed files with 244 additions and 122 deletions
23
kernel.spec
23
kernel.spec
|
|
@ -68,9 +68,9 @@ Summary: The Linux kernel
|
|||
# The next upstream release sublevel (base_sublevel+1)
|
||||
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||
# The rc snapshot level
|
||||
%define rcrev 5
|
||||
%define rcrev 6
|
||||
# The git snapshot level
|
||||
%define gitrev 5
|
||||
%define gitrev 1
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 3.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
|
@ -125,7 +125,7 @@ Summary: The Linux kernel
|
|||
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
|
||||
# and 0 for rawhide (all kernels are debug kernels).
|
||||
# See also 'make debug' and 'make release'.
|
||||
%define debugbuildsenabled 0
|
||||
%define debugbuildsenabled 1
|
||||
|
||||
# Want to build a vanilla kernel build without any non-upstream patches?
|
||||
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
|
||||
|
|
@ -619,6 +619,9 @@ Patch26021: drm-vmwgfx-Fix-drm.h-include.patch
|
|||
|
||||
Patch26022: x86-efi-Delete-misleading-efi_printk-error-message.patch
|
||||
|
||||
#rhbz 1123584
|
||||
Patch26028: HID-rmi-check-sanity-of-incoming-report.patch
|
||||
|
||||
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
|
||||
Patch30000: kernel-arm64.patch
|
||||
|
||||
|
|
@ -1365,6 +1368,9 @@ ApplyPatch drm-vmwgfx-Fix-drm.h-include.patch
|
|||
|
||||
ApplyPatch x86-efi-Delete-misleading-efi_printk-error-message.patch
|
||||
|
||||
#rhbz 1123584
|
||||
ApplyPatch HID-rmi-check-sanity-of-incoming-report.patch
|
||||
|
||||
%if 0%{?aarch64patches}
|
||||
ApplyPatch kernel-arm64.patch
|
||||
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
|
||||
|
|
@ -2243,6 +2249,17 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Tue Sep 23 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- 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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue