From patchwork Thu Sep 28 01:38:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 145756 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3102935vqu; Wed, 27 Sep 2023 23:12:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRvbgEHB/gR5O+J2Xa+O3rVxtoCCdaEWCnm6piFfUmO6JU+hnBovtupDnRH5rGC32ffMmO X-Received: by 2002:a17:902:7441:b0:1c5:6199:ed95 with SMTP id e1-20020a170902744100b001c56199ed95mr283907plt.39.1695881544763; Wed, 27 Sep 2023 23:12:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695881544; cv=none; d=google.com; s=arc-20160816; b=R/ZzELFNB/IVfQgRywp9CiNoQqreoShYbjpT/YJgwGBrKv+MakcUqNhIvmHboTjqkE RxJSgO5dhBpNfJEPKmFpjz16LxcvdqBmA1evZYkp4AdMkzs7e/HYMHyqoDAPPTPR3A59 YfQo1mitLUW7erpS2XQWJwF7jmksmg1l9MN0RCw4Y54+cemEKURq65RtYCYNWoFvCz+O 8FbZ6xUQhtqeJe2G3yD8vBYUeBSr7zlrztE0FlXWGOEidkvHrVmLq407KfLTvVLben26 noIIoE65hfTMmGzOeKPlmZkCnDHw+RNmjLfKo6RegqlckpGgo977pjnbcpYR4QDyPnWK fMoA== 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=4W+f+ovUwsLwYCoWqlzJUOaeyo1Y7RbHKZd/nFecJsc=; fh=yoTw167oGeCu4n8suUnvX394GN0VTz6g0X6d1fl99zI=; b=Z2qvq0a/oFATAV7Izmr2aPydEpswfZi1RlcYcQEGtwS+viLh1r+t0Amv0bqUK0hrs+ nBTEgVJ9EVkanApSP7bqZ7RsRyv9WaLa1EDjoDzyCo9q3qb/KhFVXDAvrOmar3ZuQ90O Rs1RB0/aF5UwWEU1N3z5irz2cZ0NWuQBs5kQmw0AUUze/kAQh15woIdlN7eb0/IcVRNj Ay2Qn9xPyBtGO2oPUUjd7XlocL80OGX0uN6fk2p7FX+a2Kt+z0ALnFoq08eGTQSUsJdb ZHjRnjDWiopr/NWyIYuK8LZLeaagadXI9REKUxvfNmSgmz0n/H3pt+pbg81qjED2EZbh AsKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=sHmfRKop; 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 ld12-20020a170902facc00b001c3671d3151si16887521plb.92.2023.09.27.23.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 23:12:24 -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=sHmfRKop; 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 85C50822C0EF; Wed, 27 Sep 2023 18:39:03 -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 S229844AbjI1Bi6 (ORCPT + 20 others); Wed, 27 Sep 2023 21:38:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjI1Bi5 (ORCPT ); Wed, 27 Sep 2023 21:38:57 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 003E6AC; Wed, 27 Sep 2023 18:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695865133; bh=4W+f+ovUwsLwYCoWqlzJUOaeyo1Y7RbHKZd/nFecJsc=; h=Date:From:To:Cc:Subject:From; b=sHmfRKop1SLfuyaNmOCUBOr/Mug2foMiXa+vzAgnDhUN0pOmP4H13lamzM4dC5E9a aYRrJ7pk0b1WLs+DosPpvcWAeuD9o0qNF1LxCbOqxgTfnQ7/QISrafJ5m4VadB+mLG PxNa9DgYLNvbJHdUIEdlQCQ9s7HfxObz9bjU4pfwX4HFNr905qI0aIWoDt7wT1WhBh ijyoJuCrWrCNw+HRSfJrNrpJUJ/Wu7T64WCpXDwCZCyG/EaoqHgfGfd3Jua48UbvRn 476pdDYYhMerxmbEQIfy2LlehWBzISBs/vdanNL06i4XFpPdU/oFhmDw0obN0yDBiT Rbkj5PL/bGSiQ== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rwx306MN2z4xQg; Thu, 28 Sep 2023 11:38:52 +1000 (AEST) Date: Thu, 28 Sep 2023 11:38:51 +1000 From: Stephen Rothwell To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , Leon Romanovsky , Linux Kernel Mailing List , Linux Next Mailing List , Michael Guralnik , Shay Drory Subject: linux-next: manual merge of the rdma tree with the rdma-fixes tree Message-ID: <20230928113851.5197a1ec@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=0.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SORTED_RECIPS, SPF_HELO_PASS,SPF_PASS autolearn=no 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]); Wed, 27 Sep 2023 18:39:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778260687018597544 X-GMAIL-MSGID: 1778260687018597544 Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/hw/mlx5/mr.c between commit: 374012b00457 ("RDMA/mlx5: Fix mkey cache possible deadlock on cleanup") from the rdma-fixes tree and commit: 57e7071683ef ("RDMA/mlx5: Implement mkeys management via LIFO queue") from the rdma 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 drivers/infiniband/hw/mlx5/mr.c index 433f96459246,b0fa2d644973..000000000000 --- a/drivers/infiniband/hw/mlx5/mr.c