Subject: Re: linux-next: Tree for Jul 4 -> conflict between s390 and driver-core tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Jul 2019 21:20:30 +1000

Hi Christian,

On Fri, 5 Jul 2019 10:59:01 +0200 Christian Borntraeger <[email-masked]> wrote:
>
> Linus, Vasily, for your attention in the next merge window. (I would suggest to apply
> belows fixup during the merge of whatever tree is merged 2nd).
> 
> 
> There is now a build conflict between the s390/features branch and the driver-core/driver-core-next
> especially between
> 
> commit 92ce7e83b4e5 ("driver_find_device: Unify the match function with class_find_device()")
> and
> commit ec89b55e3bce ("s390: ap: implement PAPQ AQIC interception in kernel")

I have applied the suggested fix below to linux-next today and will
apply it to the driver-core tree merge from now on.

> Stephen, can you maybe add something like this to make linux-next build again
> on s390?
> 
> diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
> index 2c9fb1423a39..7e85ba7c6ef0 100644
> --- a/drivers/s390/crypto/vfio_ap_ops.c
> +++ b/drivers/s390/crypto/vfio_ap_ops.c
> @@ -26,7 +26,7 @@
>  
>  static int vfio_ap_mdev_reset_queues(struct mdev_device *mdev);
>  
> -static int match_apqn(struct device *dev, void *data)
> +static int match_apqn(struct device *dev, const void *data)
>  {
>  	struct vfio_ap_queue *q = dev_get_drvdata(dev);
>  
> 

-- 
Cheers,
Stephen Rothwell