From: Christian Borntraeger <borntraeger@de•ibm.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Linus Torvalds <torvalds@linux-foundation•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Suzuki K Poulose <suzuki.poulose@arm•com>,
Halil Pasic <pasic@linux•ibm.com>,
linux-s390 <linux-s390@vger•kernel.org>,
Vasily Gorbik <gor@linux•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>,
Tony Krowiak <akrowiak@linux•ibm.com>
Subject: Re: linux-next: Tree for Jul 4 -> conflict between s390 and driver-core tree
Date: Fri, 5 Jul 2019 10:59:01 +0200 [thread overview]
Message-ID: <e9889ea3-0286-df1c-864c-ba67a0286855@de.ibm.com> (raw)
In-Reply-To: <20190704220945.27728dd9@canb.auug.org.au>
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")
----------- snip---------------------------
drivers/s390/crypto/vfio_ap_ops.c: In function ‘vfio_ap_get_queue’:
drivers/s390/crypto/vfio_ap_ops.c:60:13: error: passing argument 4 of ‘driver_find_device’ from incompatible pointer type [-Werror=incompatible-pointer-types]
60 | &apqn, match_apqn);
| ^~~~~~~~~~
| |
| int (*)(struct device *, void *)
In file included from ./include/linux/iommu.h:11,
from ./include/linux/vfio.h:12,
from drivers/s390/crypto/vfio_ap_ops.c:12:
./include/linux/device.h:341:16: note: expected ‘int (*)(struct device *, const void *)’ but argument is of type ‘int (*)(struct device *, void *)’
341 | struct device *driver_find_device(struct device_driver *drv,
| ^~~~~~~~~~~~~~~~~~
drivers/s390/crypto/vfio_ap_ops.c: In function ‘vfio_ap_irq_disable_apqn’:
drivers/s390/crypto/vfio_ap_ops.c:1124:13: error: passing argument 4 of ‘driver_find_device’ from incompatible pointer type [-Werror=incompatible-pointer-types]
1124 | &apqn, match_apqn);
| ^~~~~~~~~~
| |
| int (*)(struct device *, void *)
In file included from ./include/linux/iommu.h:11,
from ./include/linux/vfio.h:12,
from drivers/s390/crypto/vfio_ap_ops.c:12:
./include/linux/device.h:341:16: note: expected ‘int (*)(struct device *, const void *)’ but argument is of type ‘int (*)(struct device *, void *)’
341 | struct device *driver_find_device(struct device_driver *drv,
| ^~~~~~~~~~~~~~~~~~
----------- snip---------------------------
The fix is straighforward but it cannot be added to any of the branches as it is
only necessary (and right) when both branches are merged together.
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);
next prev parent reply other threads:[~2019-07-05 8:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 12:09 linux-next: Tree for Jul 4 Stephen Rothwell
2019-07-04 12:24 ` Stephen Rothwell
2019-07-04 12:40 ` Greg Kroah-Hartman
2019-07-06 8:34 ` Greg Kroah-Hartman
2019-07-06 9:44 ` Stephen Rothwell
2019-07-06 9:46 ` Greg Kroah-Hartman
2019-07-06 10:17 ` Stephen Rothwell
2019-07-06 14:33 ` Greg Kroah-Hartman
2019-07-06 15:42 ` Greg Kroah-Hartman
2019-07-05 8:59 ` Christian Borntraeger [this message]
2019-07-08 11:20 ` linux-next: Tree for Jul 4 -> conflict between s390 and driver-core tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e9889ea3-0286-df1c-864c-ba67a0286855@de.ibm.com \
--to=borntraeger@de$(echo .)ibm.com \
--cc=akrowiak@linux$(echo .)ibm.com \
--cc=gor@linux$(echo .)ibm.com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=pasic@linux$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=suzuki.poulose@arm$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox