diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-24 12:42:53 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-24 12:42:53 -0800 |
| commit | f15c219bae7edbc29422956535bb00c35f34b5c1 (patch) | |
| tree | 5af158f4941eb5fd99f5dbd793a800689c0e090c /kernel.spec | |
| parent | 160f417d95a261d4472bcf7dcf5e47f139c0432d (diff) | |
| parent | 258c0838a1f71d15e569ab302030f4837be9cb19 (diff) | |
| download | kernel-f15c219bae7edbc29422956535bb00c35f34b5c1.tar.gz kernel-f15c219bae7edbc29422956535bb00c35f34b5c1.tar.xz kernel-f15c219bae7edbc29422956535bb00c35f34b5c1.zip | |
Merge branch 'master' into baytrail
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 32dbef088..ba1f560f9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -43,7 +43,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 3 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -68,7 +68,7 @@ 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 0 # Set rpm version accordingly @@ -610,11 +610,12 @@ Patch26059: i8042-Add-notimeout-quirk-for-Fujitsu-Lifebook-A544-.patch Patch26064: Input-add-driver-for-the-Goodix-touchpanel.patch -Patch26065: sched-Remove-lockdep-check-in-sched_move_task.patch - #rhbz 1135338 Patch26070: HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch +#rhbz 1165206 +Patch26071: usb-quirks-Add-reset-resume-quirk-for-MS-Wireless-La.patch + # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel Patch30000: kernel-arm64.patch @@ -1358,11 +1359,12 @@ ApplyPatch i8042-Add-notimeout-quirk-for-Fujitsu-Lifebook-A544-.patch ApplyPatch Input-add-driver-for-the-Goodix-touchpanel.patch -ApplyPatch sched-Remove-lockdep-check-in-sched_move_task.patch - #rhbz 1135338 ApplyPatch HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch +#rhbz 1165206 +ApplyPatch usb-quirks-Add-reset-resume-quirk-for-MS-Wireless-La.patch + %if 0%{?aarch64patches} ApplyPatch kernel-arm64.patch %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does. @@ -2242,6 +2244,10 @@ fi # ||----w | # || || %changelog +* 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) |