move 2 pci-pm patches out of 4.14 and 4.19 queues

These cause regressions in 4.19 for Tegra machines, as reported on the
mailing list, but not in 4.14, which is odd.

So drop them both and move to pending in case someone wants to figure it
out later

diff --git a/queue-4.14/pci-pm-avoid-possible-suspend-to-idle-issue.patch b/pending/4.14/pci-pm-avoid-possible-suspend-to-idle-issue.patch
similarity index 100%
rename from queue-4.14/pci-pm-avoid-possible-suspend-to-idle-issue.patch
rename to pending/4.14/pci-pm-avoid-possible-suspend-to-idle-issue.patch

diff --git a/queue-4.14/pci-pm-skip-devices-in-d0-for-suspend-to-idle.patch b/pending/4.14/pci-pm-skip-devices-in-d0-for-suspend-to-idle.patch
similarity index 100%
rename from queue-4.14/pci-pm-skip-devices-in-d0-for-suspend-to-idle.patch
rename to pending/4.14/pci-pm-skip-devices-in-d0-for-suspend-to-idle.patch

diff --git a/queue-4.19/pci-pm-avoid-possible-suspend-to-idle-issue.patch b/pending/4.19/pci-pm-avoid-possible-suspend-to-idle-issue.patch
similarity index 100%
rename from queue-4.19/pci-pm-avoid-possible-suspend-to-idle-issue.patch
rename to pending/4.19/pci-pm-avoid-possible-suspend-to-idle-issue.patch

diff --git a/queue-4.19/pci-pm-skip-devices-in-d0-for-suspend-to-idle.patch b/pending/4.19/pci-pm-skip-devices-in-d0-for-suspend-to-idle.patch
similarity index 100%
rename from queue-4.19/pci-pm-skip-devices-in-d0-for-suspend-to-idle.patch
rename to pending/4.19/pci-pm-skip-devices-in-d0-for-suspend-to-idle.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index f8e44fd255e76f797fe2168e3609e904d2384420..09083d2f016270ef18777d197b89f41b49f0be9e 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -217,8 +217,6 @@ serial-stm32-fix-transmit_chars-when-tx-is-stopped.patch
 serial-stm32-add-support-of-tc-bit-status-check.patch
 serial-stm32-fix-wakeup-source-initialization.patch
 misc-sgi-xp-properly-initialize-buf-in-xpc_get_rsvd_.patch
-pci-pm-avoid-possible-suspend-to-idle-issue.patch
-pci-pm-skip-devices-in-d0-for-suspend-to-idle.patch
 iommu-use-right-function-to-get-group-for-device.patch
 signal-cifs-fix-cifs_put_tcp_session-to-call-send_si.patch
 inet-frags-call-inet_frags_fini-after-unregister_per.patch

diff --git a/queue-4.19/pm-acpi-pci-resume-all-devices-during-hibernation.patch b/queue-4.19/pm-acpi-pci-resume-all-devices-during-hibernation.patch
index 1808fa9de292292b0aa9af2f71e22dcb3956f1d6..f29e49ba6257763ee663342f72bc6f32781e9c1f 100644 (file)
--- a/queue-4.19/pm-acpi-pci-resume-all-devices-during-hibernation.patch
+++ b/queue-4.19/pm-acpi-pci-resume-all-devices-during-hibernation.patch
@@ -27,15 +27,13 @@ Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 Reviewed-by: Hans de Goede <hdegoede@redhat.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/acpi/device_pm.c | 13 +++++++------
- drivers/pci/pci-driver.c | 16 ++++++++--------
+ drivers/acpi/device_pm.c |   13 +++++++------
+ drivers/pci/pci-driver.c |   16 ++++++++--------
  2 files changed, 15 insertions(+), 14 deletions(-)
 
-diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
-index e0927c5fd2821..11b7a1632e5aa 100644
 --- a/drivers/acpi/device_pm.c
 +++ b/drivers/acpi/device_pm.c
-@@ -1116,13 +1116,14 @@ EXPORT_SYMBOL_GPL(acpi_subsys_resume_early);
+@@ -1116,13 +1116,14 @@ EXPORT_SYMBOL_GPL(acpi_subsys_resume_ear
  int acpi_subsys_freeze(struct device *dev)
  {
        /*
@@ -56,11 +54,9 @@ index e0927c5fd2821..11b7a1632e5aa 100644
  
        return pm_generic_freeze(dev);
  }
-diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index e69af9b8361dc..5def4b74d54a0 100644
 --- a/drivers/pci/pci-driver.c
 +++ b/drivers/pci/pci-driver.c
-@@ -996,15 +996,15 @@ static int pci_pm_freeze(struct device *dev)
+@@ -959,15 +959,15 @@ static int pci_pm_freeze(struct device *
        }
  
        /*
@@ -84,6 +80,3 @@ index e69af9b8361dc..5def4b74d54a0 100644
  
        if (pm->freeze) {
                int error;
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 0d1438e4fcba62f69b85b2e74d1dc35abe7ad481..8faea60a7c7afc3ea48a343fda262280dc8b62e2 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -390,7 +390,6 @@ serial-stm32-fix-transmit_chars-when-tx-is-stopped.patch
 serial-stm32-add-support-of-tc-bit-status-check.patch
 serial-stm32-fix-wakeup-source-initialization.patch
 misc-sgi-xp-properly-initialize-buf-in-xpc_get_rsvd_.patch
-pci-pm-avoid-possible-suspend-to-idle-issue.patch
 iommu-add-missing-new-line-for-dma-type.patch
 iommu-use-right-function-to-get-group-for-device.patch
 signal-bpfilter-fix-bpfilter_kernl-to-use-send_sig-n.patch
@@ -421,7 +420,6 @@ firmware-arm_scmi-update-rate_discrete-in-clock_desc.patch
 ntb_hw_switchtec-potential-shift-wrapping-bug-in-swi.patch
 asoc-meson-axg-tdmin-right_j-is-not-supported.patch
 asoc-meson-axg-tdmout-right_j-is-not-supported.patch
-pci-pm-skip-devices-in-d0-for-suspend-to-idle.patch
 qed-iwarp-use-read_once-and-smp_store_release-to-acc.patch
 qed-iwarp-fix-uninitialized-callback.patch
 powerpc-cacheinfo-add-cacheinfo_teardown-cacheinfo_r.patch