diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-08-20 16:56:20 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-08-20 17:04:33 -0400 |
| commit | 663b0b92dace6c68da45cb5c29e342617e0f1be1 (patch) | |
| tree | 64988c9cee26028e9a0e28b15f49d82fb23a2651 /kernel.spec | |
| parent | 341e5eb0777fe5ec20eb878c0ffb68afd93da379 (diff) | |
Linux v3.6-rc2-206-g10c63c9
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index 16d90a8d..05f65d2c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,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 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 2 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -678,7 +678,7 @@ Patch700: linux-2.6-e1000-ich9-montevina.patch Patch800: linux-2.6-crash-driver.patch # crypto/ -Patch900: modsign-20120814.patch +Patch900: modsign-20120816.patch # secure boot Patch1000: secure-boot-20120809.patch @@ -747,9 +747,6 @@ Patch22001: selinux-apply-different-permission-to-ptrace-child.patch #rhbz 836742 Patch22059: uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch -#rhbz 844485 -Patch22060: vfs-fix-file-creation-bugs.patch - # END OF PATCH DEFINITIONS %endif @@ -1382,7 +1379,7 @@ ApplyPatch linux-2.6-crash-driver.patch ApplyPatch linux-2.6-e1000-ich9-montevina.patch # crypto/ -ApplyPatch modsign-20120814.patch +ApplyPatch modsign-20120816.patch # secure boot ApplyPatch secure-boot-20120809.patch @@ -1440,9 +1437,6 @@ ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch #rhbz 836742 ApplyPatch uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch -#rhbz 844485 -ApplyPatch vfs-fix-file-creation-bugs.patch - # END OF PATCH APPLICATIONS %endif @@ -2305,6 +2299,9 @@ fi # ||----w | # || || %changelog +* Mon Aug 20 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc2.git1.1 +- Linux v3.6-rc2-206-g10c63c9 + * Mon Aug 20 2012 Dave Jones <davej@redhat.com> - Reenable W1 drivers. (rhbz 849430) |