linux-next: manual merge of the driver-core tree with the drm tree

[Mark Brown]

Hi all,

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

  rust/helpers/pci.c

between commit:

  6afbbc27f582b ("rust: pci: add sriov_get_totalvfs() helper")

from the drm tree and commit:

  3b5ea0f078e1b ("rust: pci: expose the allocated interrupt type")

from the driver-core 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.

diff --cc rust/helpers/pci.c
index 4ebf256dff230,23b06becb4489..0000000000000
--- a/rust/helpers/pci.c
+++ b/rust/helpers/pci.c
@@@ -24,14 -24,11 +24,19 @@@ __rust_helper bool rust_helper_dev_is_p
  	return dev_is_pci(dev);
  }
  
 +#ifndef CONFIG_PCI_IOV
 +__rust_helper unsigned int
 +rust_helper_pci_sriov_get_totalvfs(struct pci_dev *pdev)
 +{
 +	return pci_sriov_get_totalvfs(pdev);
 +}
 +#endif
 +
+ __rust_helper unsigned int rust_helper_pci_irq_type(struct pci_dev *pdev)
+ {
+ 	return pci_irq_type(pdev);
+ }
+ 
  #ifndef CONFIG_PCI_MSI
  __rust_helper int rust_helper_pci_alloc_irq_vectors(struct pci_dev *dev,
  						    unsigned int min_vecs,

Attachment: signature.asc
Description: PGP signature