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

[Danilo Krummrich]

On 8/17/26 5:57 PM, Mark Brown wrote:
> 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,


Looks good to me, thanks!