Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp3675717rwl; Mon, 27 Mar 2023 18:19:22 -0700 (PDT) X-Google-Smtp-Source: AKy350Z21JJlraBNcLFowdQYVD4sUkTAY6EvCRLouDYenbqmjwgchSzLGKZ82WkMQR/0wkWZKct+ X-Received: by 2002:a17:902:d485:b0:19f:3e33:b845 with SMTP id c5-20020a170902d48500b0019f3e33b845mr15117732plg.26.1679966361591; Mon, 27 Mar 2023 18:19:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679966361; cv=none; d=google.com; s=arc-20160816; b=hYvEDw9AQ/gERA4IzK/EG62h08+gnKs1xVQm7VmBf3/tAJzT7pROOeGjt1gnch3Bf6 19r7abJltTO0EZWjVP1pjDsq/7OjzCDImpnG1flYtXfWgcXt2Qe3MtRAUb/QDWl+knOx 95Aeyc4Dw1Iyu916WuMxuZXnKCmD/meLILM77tS1OCPFsd982bzrK5opMdu7GArpnW/e g7+Bdv7rgWgQVjAvYJBygxC3SPuzOlIlfUm+50Nw+7qkwjTYpJCWqy8QSiwknub5ZcuH H14bAB09Zbjz7DGoTRWS9/FKlmEw5DxgKc4Fy6FXz+pnlQl2ElorS8Tsu9LGA5sEpHTA bCbA== 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=irygyRkRlyX2cdL/E2vtShPNtwz4329GDBAPOp7SEl0=; b=k5m1OG83/ZzoN1zLZOUIwr8X1QBmOZGbZt20nC6zIQHl5l+qDGh/RSoxd1NRg75+Oy rZOKxGtNyEw2qGL+n4UBQKa3DULfSzYM2FeYZ64Cws1Jr5OYrPlUyu8kGCEumNCUgcG5 gi4tfcfoxbx6ZPo7DbPPWyGA6Lw7ccO4ZhoI6fTzb9+qyqZsM1O6pOwd/YeiHD2jFFjt gpQq+2abgtu35onh6l29+3xFB0tdjYBpdCw2mGcwAzq/vstmDsNAj732IdoCkvxNO/aV zmEXM+MNjKA3p2ruSNw1ISiYHCIWFXB6V/q521pyU/zhlRXVUFq+t+DOgrTp5DP1fiLP KVwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Q5vrpyoT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h5-20020a170902ac8500b001a220a6b915si7944561plr.613.2023.03.27.18.19.10; Mon, 27 Mar 2023 18:19:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Q5vrpyoT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230424AbjC1BQW (ORCPT + 99 others); Mon, 27 Mar 2023 21:16:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229575AbjC1BQV (ORCPT ); Mon, 27 Mar 2023 21:16:21 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1AFA1990; Mon, 27 Mar 2023 18:16:18 -0700 (PDT) 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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4PlsFm4Fsvz4wj7; Tue, 28 Mar 2023 12:16:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1679966173; bh=irygyRkRlyX2cdL/E2vtShPNtwz4329GDBAPOp7SEl0=; h=Date:From:To:Cc:Subject:From; b=Q5vrpyoTsDF5+0B+vlRql4IaKVdbiOpbR89urQHTpRhixTy8iWXTOm3xUjbv0w5Zq Pu+Q4PWDYxvyF3C6UzFEOijDD8y+IqfnCIX36cr3VyuE678AYWy9gLwoyEg00PLokK UwjiqinGa0TpdsenRa2ITm3qj4sZOdy08yVCmWBjNySgM/mLEntw2rjl2kfGF/xc0r Lhc/uRwllasyUOjPbOcZZ/yI2ss3/Y5lkkVYUPvzfGeUU+WMyKtV+9kHBgR/WJs8ZZ P0rq1CLX8awa82+pWI4wb6aFaB5Pn0XnYWNRAITIfgQ/VleVCHlFm9c6HToB+jBwN2 53Wst2b6xY8oQ== Date: Tue, 28 Mar 2023 12:16:09 +1100 From: Stephen Rothwell To: "Paul E. McKenney" Cc: Bob Pearson , Jason Gunthorpe , Jason Gunthorpe , "Joel Fernandes (Google)" , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the rcu tree with the rdma tree Message-ID: <20230328121609.68105dd5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/bfS8Ymd/nxdZ._8SdcwmK4t"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=unavailable 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 --Sig_/bfS8Ymd/nxdZ._8SdcwmK4t Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the rcu tree got a conflict in: drivers/infiniband/sw/rxe/rxe_mr.c between commit: 5bf944f24129 ("RDMA/rxe: Add error messages") from the rdma tree and commit: 330f72b82ab0 ("RDMA/rxe: Rename kfree_rcu() to kvfree_rcu_mightsleep()") from the rcu tree. I fixed it up (the code modified by the latter was moved by the former, so I used this files from the former and applied the following merge fix patch) 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, 28 Mar 2023 12:12:24 +1100 Subject: [PATCH] fixup for "RDMA/rxe: Add error messages" interacting with "RDMA/rxe: Rename kfree_rcu() to kvfree_rcu_mightsleep()" Signed-off-by: Stephen Rothwell --- drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/= rxe/rxe_verbs.c index 84b53c070fc5..bbdfbff5c752 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c @@ -1341,7 +1341,7 @@ static int rxe_dereg_mr(struct ib_mr *ibmr, struct ib= _udata *udata) if (cleanup_err) rxe_err_mr(mr, "cleanup failed, err =3D %d", cleanup_err); =20 - kfree_rcu(mr); + kfree(mr); return 0; =20 err_out: --=20 2.39.2 --=20 Cheers, Stephen Rothwell --Sig_/bfS8Ymd/nxdZ._8SdcwmK4t Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmQiP9oACgkQAVBC80lX 0Gx9Tgf/eeuAd19cygA14gyTfW2H9c7btla27HFqlUK4zuMPCKigw6/BgUF72I4a 2KQIapTEnBy0jzPgvTvlqLFqMjVOGyuCV293i4vRPh2c+kyA2KQSdxGrKedp6dMj CSKHUk42ly77tr+1n7v5AeOjriqs0k0zGYw1C8w4TCde9Fzt21ypsSxMg8R/fTkE 4/5S5MKqoIvPqc5JkvfoRAgEAFR4JHfdn+rsSk/YaDqj9VUZTh1CmDBgG0MkpYYV pq25W6bx1NIKUySICTw64xqElSbxfVkBoxkPzRgTPG6eYC93dKY3lfssrIzQkrwI g3CT7V67TqQZ9PlwrPyOKFCGhKR8tA== =AccV -----END PGP SIGNATURE----- --Sig_/bfS8Ymd/nxdZ._8SdcwmK4t--