From patchwork Tue Aug 15 02:28:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13353452 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 A803E17C4 for ; Tue, 15 Aug 2023 02:28:11 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D94810C1; Mon, 14 Aug 2023 19:28:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1692066488; bh=yn404caKCvYzrFWgHbLiy3+pIAut/KwIxxQePdoi2Nw=; h=Date:From:To:Cc:Subject:From; b=rj9NU/KPfFwRk1RbnkAeRjSUfYDPMVCHjlZz+NI6rVBEl7il1mUNf9nRfvKXSe3D8 ynq5ODoCnL4v0ERdZz1vs7FZhxs7RhbeT5gr3iKAyz8r7bb5WGxe/NG0mKccwtWiRL ABEgf4plKhrOiqN3kFIyuvpyb4jWr2HaGpUR9W5pMKhr82L/3Vj9XkIXKlgHKteQpG eCeroH1XlBYbe/pugYBnNxRHQzUC7dggew74U9jimqBhKhKIFHYlT+FLm1SlfMgFzq SJBxlNc1xyvDcUc0DCHGY6Z4zUbHoz+BSJV5mYhzd3t4p2jyFatJ14K1bybIZNNhuy vSOsB8hqMe2qQ== 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 4RPwD802qxz4wZx; Tue, 15 Aug 2023 12:28:07 +1000 (AEST) Date: Tue, 15 Aug 2023 12:28:07 +1000 From: Stephen Rothwell To: Leon Romanovsky , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Adham Faris , Jianbo Liu , Leon Romanovsky , Linux Kernel Mailing List , Linux Next Mailing List , Patrisious Haddad , Saeed Mahameed Subject: linux-next: manual merge of the mlx5-next tree with the net-next tree Message-ID: <20230815122807.7dddd4a3@canb.auug.org.au> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS, 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 Hi all, Today's linux-next merge of the mlx5-next tree got a conflict in: include/linux/mlx5/driver.h between commits: c8e350e62fc5 ("net/mlx5e: Make TC and IPsec offloads mutually exclusive on a netdev") 1f507e80c700 ("net/mlx5: Expose NIC temperature via hardware monitoring kernel API") from the net-next tree and commits: e26051386a94 ("net/mlx5e: Move MACsec flow steering and statistics database from ethernet to core") 17c5c415b9cb ("net/mlx5: Add RoCE MACsec steering infrastructure in core") from the mlx5-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 e1c7e502a4fc,728bcd6d184c..000000000000 --- a/include/linux/mlx5/driver.h