diff options
| -rw-r--r-- | kernel.spec | 23 | ||||
| -rw-r--r-- | linux-2.6-usb-wwan-update.patch | 9 | ||||
| -rw-r--r-- | sources | 1 |
3 files changed, 25 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 98f2ed1..14a4bb7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -47,7 +47,7 @@ Summary: The Linux kernel # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec). # scripts/rebase.sh should be made to do that for you, actually. # -%global baserelease 159 +%global baserelease 160 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -59,9 +59,9 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 18 +%define stable_update 19 # Is it a -stable RC? -%define stable_rc 0 +%define stable_rc 1 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -1327,7 +1327,7 @@ ApplyPatch linux-2.6-execshield.patch # xfs # btrfs -ApplyPatch linux-2.6-btrfs-fix-acl.patch +#ApplyPatch linux-2.6-btrfs-fix-acl.patch ApplyPatch btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch # eCryptfs @@ -1554,14 +1554,14 @@ ApplyPatch inotify-fix-inotify-oneshot-support.patch ApplyPatch inotify-send-IN_UNMOUNT-events.patch # add tests for aesni module (#571577) -ApplyPatch crypto-testmgr-add-null-test-for-aesni.patch +#ApplyPatch crypto-testmgr-add-null-test-for-aesni.patch # add tests for crypto async hashing (#571577) ApplyPatch crypto-add-async-hash-testing.patch # CVE-2010-2066 -ApplyPatch ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch +#ApplyPatch ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch # Fix deadlock caused by patch in 2.6.32.17 -ApplyPatch ext4-fix-freeze-deadlock-under-io.patch +#ApplyPatch ext4-fix-freeze-deadlock-under-io.patch ApplyPatch kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch @@ -2219,6 +2219,15 @@ fi %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Fri Aug 13 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.19-160.rc1 +- Linux 2.6.32.19-rc1 +- Comment out patches merged upstream: + linux-2.6-btrfs-fix-acl.patch + crypto-testmgr-add-null-test-for-aesni.patch + ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch + ext4-fix-freeze-deadlock-under-io.patch +- Fix linux-2.6-usb-wwan-update.patch to apply after 2.6.32.19 + * Tue Aug 10 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.32.18-159 - Linux 2.6.32.18 - Backport nouveau noaccel fix for nva3+ cards from f13. diff --git a/linux-2.6-usb-wwan-update.patch b/linux-2.6-usb-wwan-update.patch index d6ab3d3..1077e5b 100644 --- a/linux-2.6-usb-wwan-update.patch +++ b/linux-2.6-usb-wwan-update.patch @@ -116,7 +116,7 @@ diff -up linux-2.6.32.noarch/drivers/usb/serial/option.c.orig linux-2.6.32.noarc struct option_port_private { /* Input endpoints and buffer for this port */ struct urb *in_urbs[N_IN_URB]; -@@ -767,216 +740,28 @@ module_exit(option_exit); +@@ -767,223 +740,35 @@ module_exit(option_exit); static int option_probe(struct usb_serial *serial, const struct usb_device_id *id) { @@ -135,6 +135,13 @@ diff -up linux-2.6.32.noarch/drivers/usb/serial/option.c.orig linux-2.6.32.noarc serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff) return -ENODEV; + /* Don't bind network interfaces on Huawei K3765 & K4505 */ + if (serial->dev->descriptor.idVendor == HUAWEI_VENDOR_ID && + (serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K3765 || + serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4505) && + serial->interface->cur_altsetting->desc.bInterfaceNumber == 1) + return -ENODEV; + - data = serial->private = kzalloc(sizeof(struct option_intf_private), GFP_KERNEL); + data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL); if (!data) @@ -1,2 +1,3 @@ 260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 dc2f0fab4d67f96e593708ba9158052b patch-2.6.32.18.bz2 +ab86c5cfab95c9fe582de10c43921995 patch-2.6.32.19-rc1.bz2 |