diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2011-02-23 20:21:27 -0500 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2011-02-23 20:21:27 -0500 |
| commit | a8bce03c83bc3dd3238bd40a7633a7653a1e9251 (patch) | |
| tree | a850bc45b8c6f5079fba80f3ff3052dab9aec311 | |
| parent | a2c6d29711f2f2deee8d137b4efdb63984837d1a (diff) | |
| download | kernel-a8bce03c83bc3dd3238bd40a7633a7653a1e9251.tar.gz kernel-a8bce03c83bc3dd3238bd40a7633a7653a1e9251.tar.xz kernel-a8bce03c83bc3dd3238bd40a7633a7653a1e9251.zip | |
Linux 2.6.38-rc6-git2
| -rw-r--r-- | kernel.spec | 13 | ||||
| -rw-r--r-- | sources | 1 | ||||
| -rw-r--r-- | usb-sierra-add-airprime-direct-ip.patch | 30 |
3 files changed, 6 insertions, 38 deletions
diff --git a/kernel.spec b/kernel.spec index a3fb4be08..d5c04d6d5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -733,9 +733,6 @@ Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch Patch12438: ath5k-fix-fast-channel-change.patch -# rhbz#676860 -Patch12441: usb-sierra-add-airprime-direct-ip.patch - %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1351,9 +1348,6 @@ ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch # rhbz#672778 ApplyPatch ath5k-fix-fast-channel-change.patch -# rhbz#676860 -ApplyPatch usb-sierra-add-airprime-direct-ip.patch - # END OF PATCH APPLICATIONS %endif @@ -1957,6 +1951,9 @@ fi # and build. %changelog +* Wed Feb 23 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc6.git2.1 +- Linux 2.6.38-rc6-git2 + * Wed Feb 23 2011 Ben Skeggs <bskeggs@redhat.com> 2.6.38-0.rc6.git0.2 - nouveau: nv4x pciegart fixes, nvc0 accel improvements @@ -1,2 +1,3 @@ c8ee37b4fdccdb651e0603d35350b434 linux-2.6.37.tar.bz2 7f88891e35d060b8f1f436cf05125c36 patch-2.6.38-rc6.bz2 +3ddbe38f2ca6ae526dd0017fafdf846a patch-2.6.38-rc6-git2.bz2 diff --git a/usb-sierra-add-airprime-direct-ip.patch b/usb-sierra-add-airprime-direct-ip.patch deleted file mode 100644 index 62a7ddd89..000000000 --- a/usb-sierra-add-airprime-direct-ip.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Jon Thomas <jthomas@redhat.com> -Subj: Add new ID for Airprime/Sierra USB IP modem - -I picked up a new Sierra usb 308 (At&t Shockwave) on 2/2011 and the vendor code -is 0x0f3d - -Looking up vendor and product id's I see: - -0f3d Airprime, Incorporated - 0112 CDMA 1xEVDO PC Card, PC 5220 - -Sierra and Airprime are somehow related and I'm guessing the At&t usb 308 might -be have some common hardware with the AirPrime SL809x. - -I patched sierra.c with this and it works. - -Signed-off-by: Jon Thomas <jthomas@redhat.com> - ---- a/drivers/usb/serial/sierra.c -+++ b/drivers/usb/serial/sierra.c -@@ -301,6 +301,9 @@ static const struct usb_device_id id_tab - { USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless Direct IP modems */ - .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist - }, -+ { USB_DEVICE(0x0f3d, 0x68A3), /* Airprime/Sierra Wireless Direct IP modems */ -+ .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist -+ }, - { USB_DEVICE(0x413C, 0x08133) }, /* Dell Computer Corp. Wireless 5720 VZW Mobile Broadband (EVDO Rev-A) Minicard GPS Port */ - - { } |