From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
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: Mon, 8 Jul 2019 21:20:30 +1000 [thread overview]
Message-ID: <20190708212030.4540f81b@canb.auug.org.au> (raw)
In-Reply-To: <e9889ea3-0286-df1c-864c-ba67a0286855@de.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 1350 bytes --]
Hi Christian,
On Fri, 5 Jul 2019 10:59:01 +0200 Christian Borntraeger <borntraeger@de.ibm.com> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-07-08 11:20 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 ` linux-next: Tree for Jul 4 -> conflict between s390 and driver-core tree Christian Borntraeger
2019-07-08 11:20 ` Stephen Rothwell [this message]
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=20190708212030.4540f81b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akrowiak@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=gor@linux.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.ibm.com \
--cc=suzuki.poulose@arm.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).