delete 3.14 patch

diff --git a/queue-3.14/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch b/queue-3.14/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch
deleted file mode 100644 (file)
index 1734fae..0000000
--- a/queue-3.14/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From foo@baz Sat Dec  5 21:06:41 PST 2015
-From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
-Date: Sun, 1 Nov 2015 01:34:50 +0100
-Subject: qmi_wwan: fix entry for HP lt4112 LTE/HSPA+ Gobi 4G Module
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
-
-[ Upstream commit 70910791731b5956171e1bfcad707766b8e18fee ]
-
-The lt4112 is a HP branded Huawei me906e modem. Like other Huawei
-modems, it does not have a fixed interface to function mapping.
-Instead it uses a Huawei specific scheme: functions are mapped by
-subclass and protocol.
-
-However, the HP vendor ID is used for modems from many different
-manufacturers using different schemes, so we cannot apply a generic
-vendor rule like we do for the Huawei vendor ID.
-
-Replace the previous lt4112 entry pointing to an arbitrary interface
-number with a device specific subclass + protocol match.
-
-Reported-and-tested-by: Muri Nicanor <muri+libqmi@immerda.ch>
-Tested-by: Martin Hauke <mardnh@gmx.de>
-Fixes: bb2bdeb83fb1 ("qmi_wwan: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem")
-Signed-off-by: Bjørn Mork <bjorn@mork.no>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/usb/qmi_wwan.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/drivers/net/usb/qmi_wwan.c
-+++ b/drivers/net/usb/qmi_wwan.c
-@@ -528,6 +528,10 @@ static const struct usb_device_id produc
-                                             USB_CDC_PROTO_NONE),
-               .driver_info        = (unsigned long)&qmi_wwan_info,
-       },
-+      {       /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */
-+              USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7),
-+              .driver_info = (unsigned long)&qmi_wwan_info,
-+      },
- 
-       /* 3. Combined interface devices matching on interface number */
-       {QMI_FIXED_INTF(0x0408, 0xea42, 4)},    /* Yota / Megafon M100-1 */
-@@ -769,7 +773,6 @@ static const struct usb_device_id produc
-       {QMI_FIXED_INTF(0x413c, 0x81a4, 8)},    /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */
-       {QMI_FIXED_INTF(0x413c, 0x81a8, 8)},    /* Dell Wireless 5808 Gobi(TM) 4G LTE Mobile Broadband Card */
-       {QMI_FIXED_INTF(0x413c, 0x81a9, 8)},    /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */
--      {QMI_FIXED_INTF(0x03f0, 0x581d, 4)},    /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */
- 
-       /* 4. Gobi 1000 devices */
-       {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},    /* Acer Gobi Modem Device */

diff --git a/queue-3.14/series b/queue-3.14/series
index e476de72ef301875033a129ade3aea7354da15ea..f3162aafdec2af84a3b3afe43c866e72e6f9ff4f 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -5,7 +5,6 @@ rds-tcp-recover-correctly-from-pskb_pull-pksb_trim-failure-in-rds_tcp_data_recv.
 net-mlx4-copy-set-only-sizeof-struct-mlx4_eqe-bytes.patch
 stmmac-correctly-report-ptp-capabilities.patch
 ipmr-fix-possible-race-resulting-from-improper-usage-of-ip_inc_stats_bh-in-preemptible-context.patch
-qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch
 net-avoid-null-deref-in-inet_ctl_sock_destroy.patch
 packet-race-condition-in-packet_bind.patch
 net-fix-a-race-in-dst_release.patch