From patchwork Tue Jun 13 01:43:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 107015 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp247581vqr; Mon, 12 Jun 2023 18:55:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6xNWRBdPwv/W5BAQo0+Ow7Wwd6kfyoFauRmF/Z8OVN5Act1OjyFUV76c8325aIy67aYPxE X-Received: by 2002:aa7:c90a:0:b0:516:4e6b:fa46 with SMTP id b10-20020aa7c90a000000b005164e6bfa46mr5255705edt.31.1686621358584; Mon, 12 Jun 2023 18:55:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686621358; cv=none; d=google.com; s=arc-20160816; b=hfWLHUY1DeB1QaWnADg69aWYSIcxVHaTlyTetQK8RwM8JFXsBa13sJ0biroKYXmHdv HQmNxKakZsRelE0spUpueCQkFSaD7g8tB9Os9Cl+kmyrxRxei+G6ISa/hgM1FL0OgT6k amHcMgYsmi/ofqlqLV464xvYLe96WMnxiBlbzR6SRkJKHxwSeTOiPlzXqYZsFTqgTM1b WUoBeHJJGmri5nkEsnoY3Rk3bswlbSdJaYW/qiyfOzVvZ6Bd0nHsLqZC2sE/LfUof4g8 ND+qL2/GZ0YZLgyyryBRh54jfm2jgC3D53uu1FsZviUNMlT882pHWUecs/tpeAGh2WOX bH2A== 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=Vhn9NCKI4b+ZWwXU2mlVYVnz7rRJJ08hkIiKzkVYNNo=; b=oQcYm77BL210pc70SpUCsXiSp0PUbhv4YQVPfLgyxvdm3XQQ1bLou0YpITedMLxi1C n6BOtBJ3Zp7WNKwvGNSWIM9bMqgxfT30kTph1qz/MY58NtZegivcRZQDu4d9weEa88AQ I6LBkodzjbhPznTU2gsov/uOGVtKZmNBPdCFzdNmeg9K786LJTx2IRxdI+M6GPeknVvn eylkDWpbp6cGCsBTZnM26fjVVQoHsufomXpkXyieFDjdpoR0yXNRBhEjSrqz4O3WK4dl Kgp9Iidn5B40d0MexYfy+wZ8kIElH0hthhRiZg7X/J7P5Vy8a2c4m9WkV6wBwoSszGzy +0Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Gl2PVoSM; 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 x24-20020aa7dad8000000b0050d0ddf6582si6707728eds.474.2023.06.12.18.55.33; Mon, 12 Jun 2023 18:55:58 -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=Gl2PVoSM; 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 S238666AbjFMBoS (ORCPT + 99 others); Mon, 12 Jun 2023 21:44:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238478AbjFMBoL (ORCPT ); Mon, 12 Jun 2023 21:44:11 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD55E91; Mon, 12 Jun 2023 18:44:08 -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 4QgBDL0pVrz4xFc; Tue, 13 Jun 2023 11:44:01 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686620642; bh=Vhn9NCKI4b+ZWwXU2mlVYVnz7rRJJ08hkIiKzkVYNNo=; h=Date:From:To:Cc:Subject:From; b=Gl2PVoSMjROmQV85BXjwHm8FVfTw9DainPcCxPYiy604f5OA0xu+ovoq2fmrPponP uN4+Ru7Q64Mq1e98klr030HcrwHBch4w75LHIcz7mcLrRPylGxccjCvgptG+8cNX6X CS2kESfJEDeCl8NNP+u1qzfDOipm6WTF4gDz/bFK/HlZYyZk6oO42gsgGXd1e1NU0w /X6ZD7PE/GMIdfwXqNjZ0lQIh2wE6SAfNcyW38Eu1ykLxEkoj0HOsYKz86+0xv1YV6 1PNiwJxRw2X+zzmJybJ6pXjffzrExxOIwpHEbZQm604GWcKs+f3hSZzIkRrtud5dse s80OG90aEei4w== Date: Tue, 13 Jun 2023 11:43:59 +1000 From: Stephen Rothwell To: David Miller , Doug Ledford , Jason Gunthorpe Cc: Networking , Daniel Jurgens , Leon Romanovsky , Linux Kernel Mailing List , Linux Next Mailing List , Mark Bloch , Saeed Mahameed Subject: linux-next: manual merge of the net-next tree with the rdma-fixes tree Message-ID: <20230613114359.59cadc05@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,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768550677401865576?= X-GMAIL-MSGID: =?utf-8?q?1768550677401865576?= Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/linux/mlx5/driver.h between commit: 617f5db1a626 ("RDMA/mlx5: Fix affinity assignment") from the rdma-fixes tree and commit: dc13180824b7 ("net/mlx5: Enable devlink port for embedded cpu VF vports") from the net-next 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/mlx5/driver.h index e0156b54d0b3,18a608a1f567..000000000000 --- a/include/linux/mlx5/driver.h