On Fri, Jul 12, 2019 at 09:36:23AM +0200, Greg KH wrote: > The following changes since commit f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a: > > Linux 5.2-rc3 (2019-06-02 13:55:33 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git > tags/driver-core-5.3-rc1 > > for you to fetch changes up to c33d442328f556460b79aba6058adb37bb555389: > > debugfs: make error message a bit more verbose (2019-07-08 10:44:57 +0200) > > ---------------------------------------------------------------- > Driver Core and debugfs changes for 5.3-rc1 > > Here is the "big" driver core and debugfs changes for 5.3-rc1 > > It's a lot of different patches, all across the tree due to some api > changes and lots of debugfs cleanups. Because of this, there is going > to be some merge issues with your tree at the moment, I'll follow up > with the expected resolutions to make it easier for you. > > Other than the debugfs cleanups, in this set of changes we have: > - bus iteration function cleanups (will cause build warnings > with s390 and coresight drivers in your tree)
Here's the s390 patch that was sent previously to resolve this issue.
From: Christian Borntraeger <borntrae...@de.ibm.com> commit 92ce7e83b4e5 ("driver_find_device: Unify the match function with class_find_device()") changed the prototype of driver_find_device to use a const void pointer. Change match_apqn accordingly. Fixes: ec89b55e3bce ("s390: ap: implement PAPQ AQIC interception in kernel") Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com> Signed-off-by: Vasily Gorbik <g...@linux.ibm.com> --- drivers/s390/crypto/vfio_ap_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.21.0