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  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [day] [month] [year] [list]
Date:   Mon, 15 Apr 2019 16:07:58 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Michael S. Tsirkin" <mst@...hat.com>,
        Bjorn Helgaas <bhelgaas@...gle.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jean-Philippe Brucker <jean-philippe.brucker@....com>
Subject: linux-next: manual merge of the vhost tree with the pci tree

Hi all,

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

  drivers/pci/of.c

between commit:

  9cb30a71acd4 ("PCI: OF: Support "external-facing" property")

from the pci tree and commit:

  e1c326663501 ("PCI: OF: Initialize dev->fwnode appropriately")

from the vhost 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/of.c
index 73d5adec0a28,9454c90980c9..000000000000
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@@ -32,16 -34,13 +35,18 @@@ void pci_release_of_node(struct pci_de
  
  void pci_set_bus_of_node(struct pci_bus *bus)
  {
 -	if (bus->self == NULL)
 -		bus->dev.of_node = pcibios_get_phb_of_node(bus);
 -	else
 -		bus->dev.of_node = of_node_get(bus->self->dev.of_node);
 +	struct device_node *node;
  
 -	if (bus->dev.of_node)
 -		bus->dev.fwnode = &bus->dev.of_node->fwnode;
 +	if (bus->self == NULL) {
 +		node = pcibios_get_phb_of_node(bus);
 +	} else {
 +		node = of_node_get(bus->self->dev.of_node);
 +		if (node && of_property_read_bool(node, "external-facing"))
 +			bus->self->untrusted = true;
 +	}
 +	bus->dev.of_node = node;
++	if (node)
++		bus->dev.fwnode = &node->fwnode;
  }
  
  void pci_release_bus_of_node(struct pci_bus *bus)

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists