some merge fixups

diff --git a/queue-3.10/series b/queue-3.10/series
new file mode 100644 (file)
index 0000000..aef0a6e
--- /dev/null
+++ b/queue-3.10/series
@@ -0,0 +1,3 @@
+usb-add-device-quirk-for-asus-t100-base-station-keyboard.patch
+usb-serial-cp210x-added-ketra-n1-wireless-interface-support.patch
+usb-cp210x-add-support-for-seluxit-usb-dongle.patch

diff --git a/queue-3.14/series b/queue-3.14/series
new file mode 100644 (file)
index 0000000..007b191
--- /dev/null
+++ b/queue-3.14/series
@@ -0,0 +1,5 @@
+usb-add-device-quirk-for-asus-t100-base-station-keyboard.patch
+usb-serial-cp210x-added-ketra-n1-wireless-interface-support.patch
+usb-cp210x-add-support-for-seluxit-usb-dongle.patch
+usb-musb-dsps-kill-otg-timer-on-suspend.patch
+crypto-caam-fix-addressing-of-struct-member.patch

diff --git a/queue-3.16/pci-pciehp-fix-wait-time-in-timeout-message.patch b/queue-3.16/pci-pciehp-fix-wait-time-in-timeout-message.patch
deleted file mode 100644 (file)
index b553c0a..0000000
--- a/queue-3.16/pci-pciehp-fix-wait-time-in-timeout-message.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d433889cd5a0933fbd90f1e65bff5a8d7963cc52 Mon Sep 17 00:00:00 2001
-From: Yinghai Lu <yinghai@kernel.org>
-Date: Mon, 22 Sep 2014 20:07:35 -0600
-Subject: PCI: pciehp: Fix wait time in timeout message
-
-From: Yinghai Lu <yinghai@kernel.org>
-
-commit d433889cd5a0933fbd90f1e65bff5a8d7963cc52 upstream.
-
-When we warned about a timeout on a hotplug command, we previously printed
-the time between calls to pcie_write_cmd(), without accounting for any time
-spent actually waiting.  Consider this sequence:
-
-  pcie_write_cmd
-    write SLTCTL
-    cmd_started = jiffies          # T1
-
-  pcie_write_cmd
-    pcie_wait_cmd
-      now = jiffies                # T2
-      wait_event_timeout           # we may wait here
-      if (timeout)
-        ctrl_info("Timeout on command issued %u msec ago",
-                  jiffies_to_msecs(now - cmd_started))
-
-We previously printed (T2 - T1), but that doesn't include the time spent in
-wait_event_timeout().
-
-Fix this by using the current jiffies value, not the one cached before
-calling wait_event_timeout().
-
-[bhelgaas: changelog, use current jiffies instead of adding timeout]
-Fixes: 40b960831cfa ("PCI: pciehp: Compute timeout from hotplug command start time")
-Signed-off-by: Yinghai Lu <yinghai@kernel.org>
-Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
-index 9e0f4aec5f0c..3673a913379f 100644
---- a/drivers/pci/hotplug/pciehp_hpc.c
-+++ b/drivers/pci/hotplug/pciehp_hpc.c
-@@ -173,7 +173,7 @@ static void pcie_wait_cmd(struct controller *ctrl)
-       if (!rc)
-               ctrl_info(ctrl, "Timeout on hotplug command %#06x (issued %u msec ago)\n",
-                         ctrl->slot_ctrl,
--                        jiffies_to_msecs(now - ctrl->cmd_started));
-+                        jiffies_to_msecs(jiffies - ctrl->cmd_started));
- }
- 
- /**

diff --git a/queue-3.16/series b/queue-3.16/series
new file mode 100644 (file)
index 0000000..09e38df
--- /dev/null
+++ b/queue-3.16/series
@@ -0,0 +1,9 @@
+uas-add-a-quirk-for-rejecting-ata_12-and-ata_16-commands.patch
+uas-add-no-report-opcodes-quirk.patch
+uas-add-us_fl_no_ata_1x-quirk-for-seagate-0bc2-ab20-drives.patch
+uas-add-another-asm1051-usb-id-to-the-uas-blacklist.patch
+usb-add-device-quirk-for-asus-t100-base-station-keyboard.patch
+usb-serial-cp210x-added-ketra-n1-wireless-interface-support.patch
+usb-cp210x-add-support-for-seluxit-usb-dongle.patch
+usb-musb-dsps-kill-otg-timer-on-suspend.patch
+crypto-caam-fix-addressing-of-struct-member.patch