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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBCBAC352A1 for ; Tue, 6 Dec 2022 23:24:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229735AbiLFXY0 (ORCPT ); Tue, 6 Dec 2022 18:24:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229745AbiLFXYW (ORCPT ); Tue, 6 Dec 2022 18:24:22 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 779472A71C for ; Tue, 6 Dec 2022 15:23:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670369004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qHVwCR9dXgT4rn48btgKYly0tc+kiTHkQV2npU7J1+I=; b=AmyybaiMXnDhM2daNTu7CX8eGokhGLVfEBBvCJ/eaWSnfs082dnplepvyBfACkIfsEj+TY zgtR8jW83Y/r1C1FP0YmDTClLXyhuKjJEZMRuB7ybdoEXBdCohO+x5b4feE5hbj+OFdtP1 G+b3zMD5BBzvXMSc7NRgJUgq5MsYeD4= Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-652-H761MlWkOHmSZFIBe2qPwA-1; Tue, 06 Dec 2022 18:23:23 -0500 X-MC-Unique: H761MlWkOHmSZFIBe2qPwA-1 Received: by mail-il1-f197.google.com with SMTP id x10-20020a056e021bca00b00302b6c0a683so15800105ilv.23 for ; Tue, 06 Dec 2022 15:23:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qHVwCR9dXgT4rn48btgKYly0tc+kiTHkQV2npU7J1+I=; b=buNIYRb5ra/60cykvbWwq2OMAmy6BsWA/AFd2ribpV6q3N22Q22vMqdjtV6tX672Pl 8Yus0+LWcpyhvAQXSxEk3IWCLHDkWtQhxjtnbSr7fHfysMTQxvXpsP7D+nx2U8KAObpJ XymtcriL8DCsN6Mz02921AQZk6xbbBsohxK+HKeBp0+V2qggViGW5OU7wL6dhdv7uP1E hdpOM9vOd03hnjO3aO5DTAw0MOqHpE5rxav5m5JVX8RDkQ0oiYN/DVtDvCCtSk5jjUGy nzUrlcsOyZHOAhjH9lL1V03ii/9/0V9aRhihaVZEr/qBakc7P/8cKw9P8VEzOTnwBwRt lmtA== X-Gm-Message-State: ANoB5pkwZ4uez5PtLO0Yst3VrlifDkSuPRUeHVyJrOrGIH0eQULXBz8I dSTIdYVRap9NvVitDHwv11pFDhOeIPHAtJffL9o7ctF8hsOSbpmG5v0yFx0jOHNr+GMyDu2lawn 2LAGlMqLw1pB5OweTOVXhPw0g X-Received: by 2002:a05:6638:3387:b0:375:3be7:2908 with SMTP id h7-20020a056638338700b003753be72908mr42850173jav.275.1670369002852; Tue, 06 Dec 2022 15:23:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf6SbUj9DQD4p2LUzlEY1+B7GH3nRiQqYzu6t19cZlVFdTZhm14tUnflnfLbyYzPyPHCEnCABA== X-Received: by 2002:a05:6638:3387:b0:375:3be7:2908 with SMTP id h7-20020a056638338700b003753be72908mr42850163jav.275.1670369002588; Tue, 06 Dec 2022 15:23:22 -0800 (PST) Received: from redhat.com ([38.15.36.239]) by smtp.gmail.com with ESMTPSA id b41-20020a0295ac000000b00363f8e0ab41sm7144239jai.152.2022.12.06.15.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Dec 2022 15:23:21 -0800 (PST) Date: Tue, 6 Dec 2022 16:23:19 -0700 From: Alex Williamson To: Stephen Rothwell Cc: Jason Gunthorpe , Greg KH , Greg Kroah-Hartman , Jason Gunthorpe , Linux Kernel Mailing List , Linux Next Mailing List , Yi Liu Subject: Re: linux-next: manual merge of the iommufd tree with the driver-core, vfio trees Message-ID: <20221206162319.7902bbf8.alex.williamson@redhat.com> In-Reply-To: <20221206132153.074fff0c@canb.auug.org.au> References: <20221206132153.074fff0c@canb.auug.org.au> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 6 Dec 2022 13:21:53 +1100 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the iommufd tree got a conflict in: > > drivers/vfio/vfio_main.c > > between commits: > > ff62b8e6588f ("driver core: make struct class.devnode() take a const *") > e2d55709398e ("vfio: Fold vfio_virqfd.ko into vfio.ko") > > from the driver-core, vfio trees and commits: > > c2849d718d26 ("vfio: Move vfio group specific code into group.c") > f96dc03a8368 ("vfio: Wrap vfio group module init/clean code into helpers") > > from the iommufd tree. > > I fixed it up (I think - see below and I had to add the fix up patch as > well) and can carry the fix as necessary. This is now fixed as far as > linux-next is concerned, but any non trivial conflicts should be mentioned > to your upstream maintainer when your tree is submitted for merging. > You may also want to consider cooperating with the maintainer of the > conflicting tree to minimise any particularly complex conflicts. > > From: Stephen Rothwell > Date: Tue, 6 Dec 2022 13:17:41 +1100 > Subject: [PATCH] vfio: fix up for "driver core: make struct class.devnode() take a const *" > > Signed-off-by: Stephen Rothwell > --- > drivers/vfio/group.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c > index c5d8bf10495e..bb24b2f0271e 100644 > --- a/drivers/vfio/group.c > +++ b/drivers/vfio/group.c > @@ -827,7 +827,7 @@ bool vfio_file_has_dev(struct file *file, struct vfio_device *device) > } > EXPORT_SYMBOL_GPL(vfio_file_has_dev); > > -static char *vfio_devnode(struct device *dev, umode_t *mode) > +static char *vfio_devnode(const struct device *dev, umode_t *mode) > { > return kasprintf(GFP_KERNEL, "vfio/%s", dev_name(dev)); > } > Looks good, thank you, Alex