From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A55261DE4C9 for ; Thu, 20 Mar 2025 06:35:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742452555; cv=none; b=udZBVgaAVyAU8ln54Q2W6flYCP/uGVTx6U5KkbJoeqqYXcnRjCDHmtbdtRzb/EdLdZ4TvvX0YaseJ6wiDgcZKWzrU1UiRezbdzYib+1RyUvAVjvIHXCY54f5wAv6VXeuXHKoFuAnVZIdG9TA1+f8o1nC75Vcz0pCX+uds+7UDKQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742452555; c=relaxed/simple; bh=szwn4Bj/PLXzPNZdH0y+zZEVHCkEJQZXEyGBSUkWYuU=; h=MIME-Version:Date:From:To:Cc:Message-Id:In-Reply-To:References: Subject:Content-Type; b=BPbpjrVMWWai1GlGepDcuTTN8bCJicizUcjAIe+UvguYQsUBruF9hYlW0npfRHxVCwac4ZDj4RPDyoLd3MfPzQG8n+LX3B0BzG0nwkJIqKNZGDIjH0RxHBniymEPTq/xM8vVRyhNALS/Cz41kCdykLvNeyamEgm9oKrGVtH4HLs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l8Z0aqjy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="l8Z0aqjy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB8C9C4CEE7; Thu, 20 Mar 2025 06:35:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742452555; bh=szwn4Bj/PLXzPNZdH0y+zZEVHCkEJQZXEyGBSUkWYuU=; h=Date:From:To:Cc:In-Reply-To:References:Subject:From; b=l8Z0aqjyhL3R+NZ5ZZqnHB8zfygssuRmyD9Rz5oo8+ylSnGnuWh5O7taOlX/RUv1s CTN5xXJgmmWApKZjBpqGbu8e1Yyx0XgQI22zG3NF84mCZQQ7Xfr/LQM8vIO9VX7IDy jedmWvXWv0RYBjy1ojvJZc5v2A1j4waGyKMUQkX++iiubqr+TPgZBT6eCLizBRjRqR +8OShyLlRqYqpvIp8C8jQpVtc0/OJSaMhHGHZJvtMqe31IBKnDJPRtrNzYRawyfDfV LWOYkI7eUKyWtHnMJUC44uk2dhIFtZ2/uOEzwGhtkouAb4DwsDyYlsPVpJ26WVRKLa q/dgYly1+odjQ== Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfauth.phl.internal (Postfix) with ESMTP id D13121200068; Thu, 20 Mar 2025 02:35:53 -0400 (EDT) Received: from phl-imap-12 ([10.202.2.86]) by phl-compute-10.internal (MEProxy); Thu, 20 Mar 2025 02:35:53 -0400 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddugeejhedtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhepofggfffhvfevkfgjfhfutgfgsehtjeertder tddtnecuhfhrohhmpedfnfgvohhnucftohhmrghnohhvshhkhidfuceolhgvohhnsehkvg hrnhgvlhdrohhrgheqnecuggftrfgrthhtvghrnhepjeevffelgfelvdfgvedvteelhefh vdffheegffekveelieevfeejteeileeuuedvnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhgvohhnodhmvghsmhhtphgruhhthhhpvghrshho nhgrlhhithihqdduvdeftdehfeelkeegqddvjeejleejjedvkedqlhgvohhnpeepkhgvrh hnvghlrdhorhhgsehlvghonhdrnhhupdhnsggprhgtphhtthhopeejpdhmohguvgepshhm thhpohhuthdprhgtphhtthhopehsfhhrsegtrghnsgdrrghuuhhgrdhorhhgrdgruhdprh gtphhtthhopehjghhgsehnvhhiughirgdrtghomhdprhgtphhtthhopehlvghonhhrohes nhhvihguihgrrdgtohhmpdhrtghpthhtohepmhhitghhrggvlhhguhhrsehnvhhiughirg drtghomhdprhgtphhtthhopeihihhshhgrihhhsehnvhhiughirgdrtghomhdprhgtphht thhopehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtph htthhopehlihhnuhigqdhnvgigthesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i927946fb:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id A85A11C20066; Thu, 20 Mar 2025 02:35:53 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ThreadId: T206c77f1cb322050 Date: Thu, 20 Mar 2025 08:35:32 +0200 From: "Leon Romanovsky" To: "Stephen Rothwell" , "Jason Gunthorpe" , "Leon Romanovsky" Cc: "Linux Kernel Mailing List" , "Linux Next Mailing List" , "Michael Guralnik" , "Yishai Hadas" Message-Id: <64f58e2e-3081-4523-af37-b6c344ea301d@app.fastmail.com> In-Reply-To: <20250320120823.588aa58e@canb.auug.org.au> References: <20250320120823.588aa58e@canb.auug.org.au> Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree Content-Type: text/plain Content-Transfer-Encoding: 7bit On Thu, Mar 20, 2025, at 03:08, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rdma tree got a conflict in: > > drivers/infiniband/hw/mlx5/mr.c > > between commit: > > cc668a11e6ac ("RDMA/mlx5: Fix a race for DMABUF MR which can lead to > CQE with error") > > from Linus' tree and commit: > > 24d693cf6c89 ("RDMA/mlx5: Fix cache entry update on dereg error") > > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/infiniband/hw/mlx5/mr.c > index 753faa9ad06a,2080458cabd1..000000000000 > --- a/drivers/infiniband/hw/mlx5/mr.c > +++ b/drivers/infiniband/hw/mlx5/mr.c > @@@ -2023,8 -2031,7 +2032,9 @@@ static int mlx5_revoke_mr(struct mlx5_i > struct mlx5_ib_dev *dev = to_mdev(mr->ibmr.device); > struct mlx5_cache_ent *ent = mr->mmkey.cache_ent; > bool is_odp = is_odp_mr(mr); > + bool is_odp_dma_buf = is_dmabuf_mr(mr) && > + !to_ib_umem_dmabuf(mr->umem)->pinned; > + bool from_cache = !!ent; > int ret = 0; LGTM, Thanks a lot. > > if (is_odp)