From patchwork Thu Jun 22 01:52:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 111394 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4770037vqr; Wed, 21 Jun 2023 19:06:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4sS3AUGIcP0eqOT16e3dIEn23JY5yb/pxLSVMaf4f5hkw+dO450zIkMLHpNc4YUpWZO17g X-Received: by 2002:a17:902:d345:b0:1af:e2e2:2bd9 with SMTP id l5-20020a170902d34500b001afe2e22bd9mr13628032plk.17.1687399578981; Wed, 21 Jun 2023 19:06:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687399578; cv=none; d=google.com; s=arc-20160816; b=VS54sdb9LVg9QaLmUYncsC6rvEC1ZmDZOF8hbvcDqAXEpT832aUMj0Wliw3onp+u7E wEgtK8xGVYKYMvZ5pCtoQXYo7WTBQ2Q5Z2SzD7A1wnX4AJaAtTO6rSocpa+lz1kC9tV1 LwyNHSks/tc5uSwoerr6yp8W6CqyE+es4nMTGkW7JWzatnQ1Zka3sDyS72olcj4Vzkem CVI9ezQ4iIpMsZ4QT3FG7OCvRgc+9RP+DHIiAxpDqZpKEgQASHCsJnI48BQml/XcWW5R 6SlM8rZZCLhOrcKoT/9zcvh/2Hv/tdQ82xr4kLBT6tzcNrHhB+TbwKYVfOs56enBfrex ukzw== 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=7C1ysdxUmJFw6qFlaEcbsPZAGNkDZMoL+CemQaGVg9E=; b=lVjZ0yh231H0dIoCGlgEF5zELZKJl8p5cchng8wJ+GtYhfWTZogCjMmlux6CcGxMy8 o0ryNpvXWZ01ZreQqVmoTAVzhGd6ZCwQCn25XvLfW6FKUEoAhKEjWq/mzANz5kIO80xM o1EjhzQ6nl1HsBMOrqLUqbxSqjnvlYs4xGewqU2C9F+9Dg8HVuh6kPSt6NXA0cDu8n9Y WOdzB9+JlmQ/iEewn2xsbDC2Bmn5oYHFao+O0rl4xl7mrLSAORkbEzMrZjeZ+mmZmZAI Nm7e3gwL42xuRVlHfa3P9sBSBvdSokjw7230+PFPHyZEfLwYDnmF6B42imjEoslomt+Z Fa6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=OlgEXyTx; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n2-20020a170902e54200b001b04baaba84si6212723plf.9.2023.06.21.19.06.07; Wed, 21 Jun 2023 19:06:18 -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=OlgEXyTx; 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 S230166AbjFVBw6 (ORCPT + 99 others); Wed, 21 Jun 2023 21:52:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230158AbjFVBw4 (ORCPT ); Wed, 21 Jun 2023 21:52:56 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 914D31BD9; Wed, 21 Jun 2023 18:52:52 -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 4Qmk0H5YbVz4x04; Thu, 22 Jun 2023 11:52:47 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687398768; bh=7C1ysdxUmJFw6qFlaEcbsPZAGNkDZMoL+CemQaGVg9E=; h=Date:From:To:Cc:Subject:From; b=OlgEXyTxjIPNuS+26+vBmH/saS/0llUCBIsYxPdzW1TP/FEdmVWmsyeaw6UqP0Q0T 64OKz50lQKPncGgdKuK+SUACO9+u4pM1s/h7x/H+0q4ADWQJdygzHtGfxmcY1McFoy s85npCb2tbP+K+rR67CDUDFAihVguST11oc+/VSdhuXzxBj0/cf7aQbCccH5vvSgMG pGmkN7R/dBbeTAODHCKZjxdVnymEreW9FKttP9n+Rej2GoJc4VEEzzZUZTUNi/armF rIIai8dzmVcs6nY/9qOb0zpUl+TJqMC8sMTx9dLGhlmOjh8NjksnQkVDT/g0ueULcS jOU7OOVajmCww== Date: Thu, 22 Jun 2023 11:52:46 +1000 From: Stephen Rothwell To: Doug Ledford , Jason Gunthorpe Cc: Bob Pearson , Jason Gunthorpe , Jason Gunthorpe , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the rdma tree with Linus' tree Message-ID: <20230622115246.365d30ad@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769366700693197667?= X-GMAIL-MSGID: =?utf-8?q?1769366700693197667?= Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/sw/rxe/rxe_cq.c between commit: 0c7e314a6352 ("RDMA/rxe: Fix rxe_cq_post") from the origin tree and commit: 350b6dd4b2f8 ("RDMA/rxe: Simplify cq->notify code") 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/sw/rxe/rxe_cq.c index 6ca2a05b6a2a,31a25aaa44a0..000000000000 --- a/drivers/infiniband/sw/rxe/rxe_cq.c