Subject: linux-next: manual merge of the pci tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 23 Feb 2021 11:19:11 +1100

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/pci.c

between commit:

  40fb68c7725a ("Revert "PCI/ASPM: Save/restore L1SS Capability for suspend/resume"")

from Linus' tree and commit:

  d2bb2f9e1af6 ("PCI/ASPM: Move LTR, ASPM L1SS save/restore into PCIe save/restore")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/pci.c
index b67c4327d307,13b89b1e29ed..000000000000
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -1434,6 -1474,9 +1474,8 @@@ static int pci_save_pcie_state(struct p
  	pcie_capability_read_word(dev, PCI_EXP_LNKCTL2, &cap[i++]);
  	pcie_capability_read_word(dev, PCI_EXP_SLTCTL2, &cap[i++]);
  
+ 	pci_save_ltr_state(dev);
 -	pci_save_aspm_l1ss_state(dev);
+ 
  	return 0;
  }
  
@@@ -1447,6 -1490,9 +1489,8 @@@ static void pci_restore_pcie_state(stru
  	if (!save_state)
  		return;
  
+ 	pci_restore_ltr_state(dev);		/* LTR enabled in DEVCTL2 */
 -	pci_restore_aspm_l1ss_state(dev);	/* ASPM L1 enabled in LNKCTL */
+ 
  	cap = (u16 *)&save_state->cap.data[0];
  	pcie_capability_write_word(dev, PCI_EXP_DEVCTL, cap[i++]);
  	pcie_capability_write_word(dev, PCI_EXP_LNKCTL, cap[i++]);