linux-kernel - linux-next: manual merge of the usb tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190904200929.00cfb98a@canb.auug.org.au>
Date:   Wed, 4 Sep 2019 20:09:29 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Heikki Krogerus <heikki.krogerus@...ux.intel.com>,
        Saranya Gopal <saranya.gopal@...el.com>,
        Balaji Manoharan <m.balaji@...el.com>
Subject: linux-next: manual merge of the usb tree with the pm tree

Hi all,

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

  drivers/usb/roles/intel-xhci-usb-role-switch.c

between commit:

  d2a90ebb6553 ("usb: roles: intel_xhci: Supplying software node for the role mux")

from the pm tree and commit:

  2be1fb64dfeb ("usb: roles: intel: Enable static DRD mode for role switch")

from the usb 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/usb/roles/intel-xhci-usb-role-switch.c
index 7325a84dd1c8,88d041601c51..000000000000
--- a/drivers/usb/roles/intel-xhci-usb-role-switch.c
+++ b/drivers/usb/roles/intel-xhci-usb-role-switch.c
@@@ -37,12 -44,9 +44,13 @@@
  struct intel_xhci_usb_data {
  	struct usb_role_switch *role_sw;
  	void __iomem *base;
+ 	bool enable_sw_switch;
  };
  
 +static const struct software_node intel_xhci_usb_node = {
 +	"intel-xhci-usb-sw",
 +};
 +
  static int intel_xhci_usb_set_role(struct device *dev, enum usb_role role)
  {
  	struct intel_xhci_usb_data *data = dev_get_drvdata(dev);
@@@ -147,20 -167,12 +167,22 @@@ static int intel_xhci_usb_probe(struct 
  
  	platform_set_drvdata(pdev, data);
  
+ 	data->enable_sw_switch = !device_property_read_bool(dev,
+ 						"sw_switch_disable");
 +	ret = software_node_register(&intel_xhci_usb_node);
 +	if (ret)
 +		return ret;
 +
 +	sw_desc.set = intel_xhci_usb_set_role,
 +	sw_desc.get = intel_xhci_usb_get_role,
 +	sw_desc.allow_userspace_control = true,
 +	sw_desc.fwnode = software_node_fwnode(&intel_xhci_usb_node);
  
  	data->role_sw = usb_role_switch_register(dev, &sw_desc);
 -	if (IS_ERR(data->role_sw))
 +	if (IS_ERR(data->role_sw)) {
 +		fwnode_handle_put(sw_desc.fwnode);
  		return PTR_ERR(data->role_sw);
 +	}
  
  	pm_runtime_set_active(dev);
  	pm_runtime_enable(dev);

Content of type "application/pgp-signature" skipped