From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B537C606AF for ; Mon, 8 Jul 2019 11:20:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34C6B20665 for ; Mon, 8 Jul 2019 11:20:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="b3sqh3jC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730428AbfGHLUi (ORCPT ); Mon, 8 Jul 2019 07:20:38 -0400 Received: from ozlabs.org ([203.11.71.1]:51465 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728684AbfGHLUh (ORCPT ); Mon, 8 Jul 2019 07:20:37 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 45j30K01WRz9sNC; Mon, 8 Jul 2019 21:20:32 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1562584833; bh=1TPn9uSS0m8JcqwzvlMOpK6rYAOrtfTPgQZRUVfIi+A=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=b3sqh3jCRm8J6cj24+yVU9MXRWHmAPyzSy1gI87xVUhqG1Mf8OFEMStWG0cLUByWq dScizc8JWgVyr3VsaubU65fLyYcBCgRx9uYissW5wWrMsW6rqIr7EiEI3QVNB4ZL3S yS6FGmmaUzWflaGlmIIDXUIvtmzqXLiUS8v71UrhSIuV0y0LsiuB69jnNVQbmL8uDz WfeGFzLJOMyBHtgxydagG8E0V12oABbjcgEzN6fyW+7ziMUD741lhH+QyP3kYIWJJS gtVwEg6O6dc54O+FIhFcCvTC4dc2i3q1lP4Xjru9S6u4m78DaBkyyFCADYDNubmjBs pqm6OrIXD2bDw== Date: Mon, 8 Jul 2019 21:20:30 +1000 From: Stephen Rothwell To: Christian Borntraeger Cc: Linus Torvalds , Linux Next Mailing List , Linux Kernel Mailing List , Greg Kroah-Hartman , Suzuki K Poulose , Halil Pasic , linux-s390 , Vasily Gorbik , Heiko Carstens , Tony Krowiak Subject: Re: linux-next: Tree for Jul 4 -> conflict between s390 and driver-core tree Message-ID: <20190708212030.4540f81b@canb.auug.org.au> In-Reply-To: References: <20190704220945.27728dd9@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/E+fA_B45RM4/Jdz2PL=40nh"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/E+fA_B45RM4/Jdz2PL=40nh Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Christian, On Fri, 5 Jul 2019 10:59:01 +0200 Christian Borntraeger wrote: > > Linus, Vasily, for your attention in the next merge window. (I would sugg= est to apply > belows fixup during the merge of whatever tree is merged 2nd). >=20 >=20 > There is now a build conflict between the s390/features branch and the dr= iver-core/driver-core-next > especially between >=20 > commit 92ce7e83b4e5 ("driver_find_device: Unify the match function with c= lass_find_device()") > and > commit ec89b55e3bce ("s390: ap: implement PAPQ AQIC interception in kerne= l") 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 a= gain > on s390? >=20 > 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 @@ > =20 > static int vfio_ap_mdev_reset_queues(struct mdev_device *mdev); > =20 > -static int match_apqn(struct device *dev, void *data) > +static int match_apqn(struct device *dev, const void *data) > { > struct vfio_ap_queue *q =3D dev_get_drvdata(dev); > =20 >=20 --=20 Cheers, Stephen Rothwell --Sig_/E+fA_B45RM4/Jdz2PL=40nh Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0jJv4ACgkQAVBC80lX 0Gzj2wgAireRW4yZvEvuHNIGpIEiUp8XMbmrYdVXI3lf9VSTOAleq7vsS4RgX9tl 0cLg6vbumKyUEB/3DPtQdSobmAaJ16+2jEzOpAl4JYCLprowO5KmT1WfcohiQEhu HDyi598H17GAdV1vr6ME2jcp9GzPTJutoU9kTFww3ljAyl4TXs1lHuvqnF5xU61V Er2LB0Ki1wcd7yV0B1+uS/bYdMaXQGRGMEWAzD6gTSZzgjE8L2N86FXlfMfw/kPZ B4cEey5t7TtnnydGexQEcm7W6eiB93MamYowlUMck+GkAM9NOomQuS7j0AmDnxNy xEng27jlup2og3xq/BYL5HJetvJFJw== =Rczw -----END PGP SIGNATURE----- --Sig_/E+fA_B45RM4/Jdz2PL=40nh--