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 BB3A2C4332F for ; Mon, 14 Nov 2022 15:33:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236833AbiKNPdZ (ORCPT ); Mon, 14 Nov 2022 10:33:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234803AbiKNPdW (ORCPT ); Mon, 14 Nov 2022 10:33: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 F3D652B27E for ; Mon, 14 Nov 2022 07:32:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668439941; 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=riRMqi77jXEYSwfnt37XFg/WulJLMHf4DMWhEmN9Kr4=; b=Oy7iWQWpB3kjO1yVZSv7Tp/eUhl9PcRdIfsZRJrdG00ACaNXXbK6LntPQb/BfPfDM2ZzOD 3SyavfJExXP4TOK0FV4/5b4QLEZV8n1MSlPUezT4VQwdffaWOJdVP3w7Splmnhj1tmJfFC 5Vu+G/wj2ATEethRu2DcTadcd4WgIwY= Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-396-g742J41EMzC5tQA_7Pgang-1; Mon, 14 Nov 2022 10:32:19 -0500 X-MC-Unique: g742J41EMzC5tQA_7Pgang-1 Received: by mail-il1-f198.google.com with SMTP id a15-20020a056e0208af00b00300806a52b6so9554981ilt.22 for ; Mon, 14 Nov 2022 07:32:19 -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=riRMqi77jXEYSwfnt37XFg/WulJLMHf4DMWhEmN9Kr4=; b=xpHUE+bOlYMMdkA5legIM99246/2EYnxJ1Ay+V2REXvsNQGLV/bNAWUjOnYUS95gTC DuhKz2G02v+MzUlv0eUKCpXEeD6ry3mD+K3F9ezUo9lsI9osg2mECLTBZeCzDMicBcQS bPWRfrv3rzU+Q/WWjzcRyYRBPpWl/rU1Vdl36GnSyGbNUQa2R4svxcWrgL+iNuFt9NSq 65SPNWFzuK6igTqxK2yz8S+Nwr5d/814qtmFsSub7//QpNWaWkzhySVrG6Z67hXzvayS 5pn8kZCylhpJblzZ4oFN3kqb7eP7vnzudD8/mA0SG6AJ0RyXphJhWAsoFgopScEuNqA8 1kqg== X-Gm-Message-State: ANoB5pl5Ih0nCgkEVYzZayrbzhmElJFtITFZD1FDK/5Zm1zYw5+Nh1ts P4VSOgbsSYl7wopEpEP+Yhpnm8Chj15z1V/SOd00k/BEUarrUPp4jgFxRbk5eAYlx2W8Gv9qF/p MmkcJbmVP+jQpZ5YmpkIv7Dju X-Received: by 2002:a92:910:0:b0:300:d7db:639e with SMTP id y16-20020a920910000000b00300d7db639emr6700786ilg.264.1668439939174; Mon, 14 Nov 2022 07:32:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf6CM2CxN7w5a40B6iTPwNYm9GQh8Aq0Gcp57lphosvBVmUj0l1rXR9qaKJSWIDFve4s4sKTcw== X-Received: by 2002:a92:910:0:b0:300:d7db:639e with SMTP id y16-20020a920910000000b00300d7db639emr6700769ilg.264.1668439938905; Mon, 14 Nov 2022 07:32:18 -0800 (PST) Received: from redhat.com ([38.15.36.239]) by smtp.gmail.com with ESMTPSA id j15-20020a0566022ccf00b006ce94d987a3sm4027515iow.30.2022.11.14.07.32.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 07:32:17 -0800 (PST) Date: Mon, 14 Nov 2022 08:32:07 -0700 From: Alex Williamson To: Jason Gunthorpe Cc: Stephen Rothwell , Anthony DeRossi , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the iommufd tree with the vfio-fixes tree Message-ID: <20221114083207.49d2274f.alex.williamson@redhat.com> In-Reply-To: References: <20221111153735.07a2bee1@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 Mon, 14 Nov 2022 09:35:39 -0400 Jason Gunthorpe wrote: > On Fri, Nov 11, 2022 at 03:37:35PM +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 commit: > > > > 7fdba0011157 ("vfio: Fix container device registration life cycle") > > > > from the vfio-fixes tree and commit: > > > > 55e16a188913 ("vfio: Move vfio_device driver open/close code to a function") > > > > from the iommufd tree. > > > > I fixed it up (I just used the latter version since it seems to > > incorporate the former change) and can carry the fix as necessary. > > Yes, that is right, it is as Alex and I discussed My plan is to merge back my fixes branch after it gets pulled into v6.1-rc so the vfio-iommufd support can be re-based to avoid this for v6.2. Thanks, Alex