From patchwork Wed Oct 11 05:03:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 151111 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp309253vqb; Tue, 10 Oct 2023 22:04:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF335z4iHbCKMXz9HlNaHaQ1Sbyt1+ufehjMOGSRLXXDUqRtTZjYVWbFFxyOEto9Tw+c0a+ X-Received: by 2002:a17:902:ea0e:b0:1c1:ee23:bb75 with SMTP id s14-20020a170902ea0e00b001c1ee23bb75mr23073320plg.1.1697000658135; Tue, 10 Oct 2023 22:04:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697000658; cv=none; d=google.com; s=arc-20160816; b=Tl67VsMU+JwIesXVGbjXj9R5hWKp3P/qt/ZPe5hdUsw9+xB0CvRlgzAsiXtVIE0SKY R3BgXWn8aLrQGmNxGImadi5Ht/RGk0wbpD5wR1Tr9KiiACYEXivx55YjagL0J6U/9NlF pgbSviNdm2QEgKXHoWoKPjkGXaMc8ge9/COTKC/cGhVb50aDlJBLXfcCb6FtJutmqoH9 MXKExzVpSS0nXJWOgEKCo5Fx8GmpvOP1aJY6XIHa7CXPu65lFfbq0PcxCduoYMdP8A03 Byp/vYmwmfPgIxHY59jVQslxD1ID7DX6BA4z/u6keVLuv07E7Wl58tUPfZqRA16OI2qY cVgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=K3u8hkJcQqtO+YQvZ3kZU5fcYnwrYeu1GVkzg+7Fdgg=; fh=Yq9NgPdPNJ3f/a3H+WZ8kcj6ghWN4WvEK/lYOs8bYXI=; b=aoNvIdvMiVSM5qr+BNYemclV49WBOXRvhTjy3+Ej3jw6GCdAaIrJnAMIBOMNLHkxls t51JKPBnm+meoJ8qg2UijWs3KUl/tspitLlQnKQJSOjrwl7BCTIjrDekOE9m5KQZtKgJ 7AVvC6Z+XaPAzlFOeYHyQh9HvPgszOubfuyNq8WRzb7s9L+CCzPBHHd96I1w2+CRIruY tmDWYk6Yo/A3MXjw83LgV45IFA1EsnlXa0oTy6TJ3Mq2TC9x8pgRUzI16t0CFyVFfU0/ 5uk3guPTiHicByDEgErNX5kpbmPJpMkbl9wrezR1H6RHUfKVyfquUZ5hYyHvtD/JrmmL 5VZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=PKm7Vnl0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id s16-20020a170902ea1000b001bc674914b0si14337828plg.472.2023.10.10.22.04.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 22:04:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=PKm7Vnl0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 62016813CD91; Tue, 10 Oct 2023 22:04:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229615AbjJKFEM (ORCPT + 19 others); Wed, 11 Oct 2023 01:04:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345290AbjJKFEF (ORCPT ); Wed, 11 Oct 2023 01:04:05 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB30A98; Tue, 10 Oct 2023 22:04:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697000639; bh=K3u8hkJcQqtO+YQvZ3kZU5fcYnwrYeu1GVkzg+7Fdgg=; h=Date:From:To:Cc:Subject:From; b=PKm7Vnl0FYcA/3EuADgVuW2upi0LvJD4xUR5NVJL6hL3R4ci5S6G2oD1JRjm5vSNd 1og8cTPiAOdm00Gwdv2bm7oh01YLmyTtQV2W3c5fbstjNKCxvORJWtr+56SGkUJeQ3 mcw81fHPzr59vx38SLnwMMsw1wXN7QYeOzPALP7oW57N72YSRWltXtCxMe+9I5G3pE TM/iiW3evty7xrp7noxBne6jFgUJ5CZ12SPLbkP+5F66wCqPeYyGXPRBoGTcRwnSCD Q0JuTz0csEmjBsBbLyTtWzru6JQP7gw9/dLLlT49h+KGLS7Aj5TOzALoQOGOeBDeUm 217F8yB9qvbFw== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S50zd6kPbz4xVW; Wed, 11 Oct 2023 16:03:57 +1100 (AEDT) Date: Wed, 11 Oct 2023 16:03:57 +1100 From: Stephen Rothwell To: Jason Gunthorpe , Joerg Roedel Cc: Jason Gunthorpe , Joerg Roedel , Linux Kernel Mailing List , Linux Next Mailing List , Lu Baolu , Nicolin Chen , Yi Liu Subject: linux-next: manual merge of the iommufd tree with the iommu tree Message-ID: <20231011160357.292c84e3@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 10 Oct 2023 22:04:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779434162092829005 X-GMAIL-MSGID: 1779434162092829005 Hi all, Today's linux-next merge of the iommufd tree got a conflict in: include/linux/iommu.h between commit: 4601cd2d7c4c ("iommu: Add ops->domain_alloc_paging()") from the iommu tree and commit: 909f4abd1097 ("iommu: Add new iommu op to create domains owned by userspace") from the iommufd tree. I fixed it up (see below) 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. diff --cc include/linux/iommu.h index 0c4d8ae985ac,3861d66b65c1..000000000000 --- a/include/linux/iommu.h