Hi all,

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

  drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c

between commit:

  ad783b9f8e78 ("PCI/pwrctl: Abandon QCom WCN probe on pre-pwrseq device-trees")

from Linus' tree and commits:

  086bf79a4d45 ("PCI/pwrctrl: Rename pwrctl files to pwrctrl")
  e826ea4c7f26 ("PCI/pwrctrl: Rename pwrctrl functions and structures")

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/pwrctrl/pci-pwrctrl-pwrseq.c
index 0e6bd47671c2,e9f89866b7c2..000000000000
--- a/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
+++ b/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
@@@ -6,9 -6,9 +6,9 @@@
  #include <linux/device.h>
  #include <linux/mod_devicetable.h>
  #include <linux/module.h>
- #include <linux/pci-pwrctl.h>
 -#include <linux/of.h>
+ #include <linux/pci-pwrctrl.h>
  #include <linux/platform_device.h>
 +#include <linux/property.h>
  #include <linux/pwrseq/consumer.h>
  #include <linux/slab.h>
  #include <linux/types.h>
@@@ -18,51 -18,16 +18,51 @@@ struct pci_pwrctrl_pwrseq_data 
  	struct pwrseq_desc *pwrseq;
  };
  
- struct pci_pwrctl_pwrseq_pdata {
++struct pci_pwrctrl_pwrseq_pdata {
 +	const char *target;
 +	/*
 +	 * Called before doing anything else to perform device-specific
 +	 * verification between requesting the power sequencing handle.
 +	 */
 +	int (*validate_device)(struct device *dev);
 +};
 +
- static int pci_pwrctl_pwrseq_qcm_wcn_validate_device(struct device *dev)
++static int pci_pwrctrl_pwrseq_qcm_wcn_validate_device(struct device *dev)
 +{
 +	/*
 +	 * Old device trees for some platforms already define wifi nodes for
 +	 * the WCN family of chips since before power sequencing was added
 +	 * upstream.
 +	 *
 +	 * These nodes don't consume the regulator outputs from the PMU, and
 +	 * if we allow this driver to bind to one of such "incomplete" nodes,
 +	 * we'll see a kernel log error about the indefinite probe deferral.
 +	 *
 +	 * Check the existence of the regulator supply that exists on all
 +	 * WCN models before moving forward.
 +	 */
 +	if (!device_property_present(dev, "vddaon-supply"))
 +		return -ENODEV;
 +
 +	return 0;
 +}
 +
- static const struct pci_pwrctl_pwrseq_pdata pci_pwrctl_pwrseq_qcom_wcn_pdata = {
++static const struct pci_pwrctrl_pwrseq_pdata pci_pwrctrl_pwrseq_qcom_wcn_pdata = {
 +	.target = "wlan",
- 	.validate_device = pci_pwrctl_pwrseq_qcm_wcn_validate_device,
++	.validate_device = pci_pwrctrl_pwrseq_qcm_wcn_validate_device,
 +};
 +
- static void devm_pci_pwrctl_pwrseq_power_off(void *data)
+ static void devm_pci_pwrctrl_pwrseq_power_off(void *data)
  {
  	struct pwrseq_desc *pwrseq = data;
  
  	pwrseq_power_off(pwrseq);
  }
  
- static int pci_pwrctl_pwrseq_probe(struct platform_device *pdev)
+ static int pci_pwrctrl_pwrseq_probe(struct platform_device *pdev)
  {
- 	const struct pci_pwrctl_pwrseq_pdata *pdata;
- 	struct pci_pwrctl_pwrseq_data *data;
++	const struct pci_pwrctrl_pwrseq_pdata *pdata;
+ 	struct pci_pwrctrl_pwrseq_data *data;
  	struct device *dev = &pdev->dev;
  	int ret;
  
@@@ -109,17 -64,17 +109,17 @@@ static const struct of_device_id pci_pw
  	{
  		/* ATH11K in QCA6390 package. */
  		.compatible = "pci17cb,1101",
- 		.data = &pci_pwrctl_pwrseq_qcom_wcn_pdata,
 -		.data = "wlan",
++		.data = &pci_pwrctrl_pwrseq_qcom_wcn_pdata,
  	},
  	{
  		/* ATH11K in WCN6855 package. */
  		.compatible = "pci17cb,1103",
- 		.data = &pci_pwrctl_pwrseq_qcom_wcn_pdata,
 -		.data = "wlan",
++		.data = &pci_pwrctrl_pwrseq_qcom_wcn_pdata,
  	},
  	{
  		/* ATH12K in WCN7850 package. */
  		.compatible = "pci17cb,1107",
- 		.data = &pci_pwrctl_pwrseq_qcom_wcn_pdata,
 -		.data = "wlan",
++		.data = &pci_pwrctrl_pwrseq_qcom_wcn_pdata,
  	},
  	{ }
  };