From 80112f6793b9887e8d08bf2e235d20fb04e85e58 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 17 May 2013 15:39:00 -0700 Subject: backports: refresh patches for v3.10-rc1 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.76 [ OK ] 18 3.1.10 [ OK ] 19 3.2.44 [ OK ] 20 3.3.8 [ OK ] 21 3.4.43 [ OK ] 22 3.5.7 [ OK ] 23 3.6.11 [ OK ] 24 3.7.10 [ OK ] 25 3.8.11 [ OK ] 26 3.9.0 [ OK ] real 30m50.520s user 815m12.233s sys 127m49.075s Signed-off-by: Luis R. Rodriguez --- .../drivers_gpu_drm_i915_intel_opregion.patch | 2 +- patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch | 2 +- patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch | 4 ++-- .../network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch | 4 ++-- .../network/54-get_ts_info/drivers_net_usb_usbnet.patch | 2 +- .../network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/collateral-evolutions/drm/05-i915-define-acpi-video-class/drivers_gpu_drm_i915_intel_opregion.patch b/patches/collateral-evolutions/drm/05-i915-define-acpi-video-class/drivers_gpu_drm_i915_intel_opregion.patch index b4dcd2a0..2ad5abf9 100644 --- a/patches/collateral-evolutions/drm/05-i915-define-acpi-video-class/drivers_gpu_drm_i915_intel_opregion.patch +++ b/patches/collateral-evolutions/drm/05-i915-define-acpi-video-class/drivers_gpu_drm_i915_intel_opregion.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c -@@ -250,6 +250,9 @@ static int intel_opregion_video_event(st +@@ -307,6 +307,9 @@ static int intel_opregion_video_event(st struct acpi_bus_event *event = data; int ret = NOTIFY_OK; diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch b/patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch index b12acc9d..b7f935a1 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1474,7 +1474,7 @@ usbnet_probe (struct usb_interface *udev +@@ -1540,7 +1540,7 @@ usbnet_probe (struct usb_interface *udev net->features |= NETIF_F_HIGHDMA; #endif diff --git a/patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch b/patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch index d5dd1161..9d1ad08d 100644 --- a/patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch +++ b/patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch @@ -1,7 +1,7 @@ --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile -@@ -8,7 +8,6 @@ obj-$(CONFIG_USB_PEGASUS) += pegasus.o - obj-$(CONFIG_USB_RTL8150) += rtl8150.o +@@ -9,7 +9,6 @@ obj-$(CONFIG_USB_RTL8150) += rtl8150.o + obj-$(CONFIG_USB_RTL8152) += r8152.o obj-$(CONFIG_USB_HSO) += hso.o obj-$(CONFIG_USB_NET_AX8817X) += asix.o -asix-y := asix_devices.o asix_common.o ax88172a.o diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch index 900e355b..6ab15661 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c -@@ -348,6 +348,9 @@ static int iwl_pci_resume(struct device +@@ -349,6 +349,9 @@ static int iwl_pci_resume(struct device return iwl_trans_resume(iwl_trans); } @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); #define IWL_PM_OPS (&iwl_dev_pm_ops) -@@ -363,7 +366,12 @@ static struct pci_driver iwl_pci_driver +@@ -364,7 +367,12 @@ static struct pci_driver iwl_pci_driver .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = iwl_pci_remove, diff --git a/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch b/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch index aa537ee3..3f99e107 100644 --- a/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch +++ b/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -933,7 +933,9 @@ static const struct ethtool_ops usbnet_e +@@ -997,7 +997,9 @@ static const struct ethtool_ops usbnet_e .get_drvinfo = usbnet_get_drvinfo, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch index 8b54e5f1..5a22620f 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c -@@ -717,7 +717,9 @@ static struct usb_driver cdc_driver = { +@@ -734,7 +734,9 @@ static struct usb_driver cdc_driver = { .resume = usbnet_resume, .reset_resume = usbnet_resume, .supports_autosuspend = 1, -- cgit v1.2.3