summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-14 13:09:12 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-11-14 13:09:12 -0500
commit4215bf0858fd6860d90c447c6a9c752aef0dfdbb (patch)
treeefc80b8b535329a2388884639192098592a8e9ba /kernel.spec
parentc7a536b3308eb65a29df2fbce8c1c3bc2d6cacee (diff)
downloadkernel-4215bf0858fd6860d90c447c6a9c752aef0dfdbb.tar.gz
kernel-4215bf0858fd6860d90c447c6a9c752aef0dfdbb.tar.xz
kernel-4215bf0858fd6860d90c447c6a9c752aef0dfdbb.zip
Patch from Joshua Roys to add rtl8192* to modules.networking (rhbz 753645)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index c0a73194b..c8970c739 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,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 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -1598,7 +1598,7 @@ BuildKernel() {
}
collect_modules_list networking \
- 'register_netdev|ieee80211_register_hw|usbnet_probe|phy_driver_register|rt2x00(pci|usb)_probe'
+ 'register_netdev|ieee80211_register_hw|usbnet_probe|phy_driver_register|rt(l_|2x00)(pci|usb)_probe'
collect_modules_list block \
'ata_scsi_ioctl|scsi_add_host|scsi_add_host_with_dma|blk_init_queue|register_mtd_blktrans|scsi_esp_register|scsi_register_device_handler'
collect_modules_list drm \
@@ -2060,6 +2060,9 @@ fi
# || ||
%changelog
* Mon Nov 14 2011 Josh Boyer <jwboyer@redhat.com>
+- Patch from Joshua Roys to add rtl8192* to modules.networking (rhbz 753645)
+
+* Mon Nov 14 2011 Josh Boyer <jwboyer@redhat.com>
- CVE-2011-4131: nfs4_getfacl decoding kernel oops (rhbz 753236)
- Linux 3.2-rc1-git4