From patchwork Mon Feb 6 23:19:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 53558 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2520853wrn; Mon, 6 Feb 2023 15:24:39 -0800 (PST) X-Google-Smtp-Source: AK7set9d0SB1XOvqgc8yXKRghIhR/5ECIismwmmwAZcOipDTgP0/QU3cJXx3WO+IjsT4cW5Yd4+s X-Received: by 2002:a17:907:a804:b0:8a6:5720:9101 with SMTP id vo4-20020a170907a80400b008a657209101mr1296483ejc.4.1675725878892; Mon, 06 Feb 2023 15:24:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675725878; cv=none; d=google.com; s=arc-20160816; b=Fd0uO7ec7juQxx1dhdhMrzKmUp7UOyTRwjzcz6wLeMfn4wLObiEDtMbcPvaAHxBF7T 4cKaw5NQdw1JVHNV4jAU9g6GiaA6KZ5/cDGOeVbmN4R13Ap3TMbtObcNZP8UmoH/nfv2 dQK2F+p4pdnDPDjPyRo2sgMckX5VaCsOe6SpYp9W+/XnokSRuZ0diW04RR/gyG6Yyocv BOzyuC05zfufBgL47s4BAzkB6nqA8UyXkdbJ3HZTG9WBPQkZ/E7+N8z3OJFmtKW8yyiW HdEhiCn2HQ0ydMLkIKWjhbRdiSzBbEFTyl1WnelYoPw7OpqTWSM9PMJYILhzXKVqNFxK s0og== 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=ni+bLM6l7ZkTck+F3T4d2YIdoOVQvjtejmkcOYZePOU=; b=LH0QS2i1PDBXqEgomVbW4/Nb2WalkVf3rCcLUT7Wd7MCSkEi9zhmkOIT0YZZbNCzWx +tlFL3eNZGMVe2s+VPY/mJgGHr2Rt/s/p2eDBw4nx5gXRwU4BovTm71dBGLPH/rsQmmw wk3dL9s/sKGBgpO/LeUvP89qcHyY2nR4I4rq93ESGhLtrZx1420WrLS8aGUAD8Tm7Qtj kw4IoKywuSsvLK2edx3u/nadgEKYg5A8a4ysy0GtagDH7ftObFOFE37zcGWYFDqYWpW5 tNtlmMUgTlY/YXtLdD02F5HF8R8ybKALIykkxs5brbpnhzPQV20bXKUBY19SVjHPnUk3 +1sA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=eKRlzXq8; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 2-20020a170906014200b0088260d36e27si15292374ejh.368.2023.02.06.15.24.14; Mon, 06 Feb 2023 15:24:38 -0800 (PST) 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=eKRlzXq8; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229775AbjBFXT6 (ORCPT + 99 others); Mon, 6 Feb 2023 18:19:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230010AbjBFXTz (ORCPT ); Mon, 6 Feb 2023 18:19:55 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A199A23DB7; Mon, 6 Feb 2023 15:19:54 -0800 (PST) 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 4P9j0840nlz4wgv; Tue, 7 Feb 2023 10:19:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1675725593; bh=ni+bLM6l7ZkTck+F3T4d2YIdoOVQvjtejmkcOYZePOU=; h=Date:From:To:Cc:Subject:From; b=eKRlzXq8KKU9teDIlnQo2POgDWpoyjxDu8J091pnc+cYSxbcWudHKwwrp1iib9B8s clYXeTMRFuMw2x+uFDOSxkRWegEi30aimjsfKLYD9yvoMXd3cHFmtNw9jl6RscbmAs DsFZD1cDyk7qChXtzbjovaB66gKHU7Mt351WbkdDj3Y+pADmozNr15XtNSks0zidVS wgXrS7FPr3zeWJYQOKSB5IhrUjHfc6h0W6Yw/JTnD3cTGlGeeea9yUccyxHW0PRf1u dNvXue9YLCsN/a8u5cBRjwyAQ+/QCorlC1RjSNCsGXnsfctFOF4BruMwsYU0+VQ4zh ///hZ30M7Lk1g== Date: Tue, 7 Feb 2023 10:19:51 +1100 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , David Miller Cc: bpf , Networking , Kumar Kartikeya Dwivedi , Linux Kernel Mailing List , Linux Next Mailing List , Lorenzo Bianconi , Marek Majtyka , Michal Swiatkowski , Tony Nguyen Subject: linux-next: manual merge of the bpf-next tree with the net-next tree Message-ID: <20230207101951.21a114fa@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS 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?1757125939150776087?= X-GMAIL-MSGID: =?utf-8?q?1757125939150776087?= Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: drivers/net/ethernet/intel/ice/ice_main.c between commit: 5b246e533d01 ("ice: split probe into smaller functions") from the net-next tree and commit: 66c0e13ad236 ("drivers: net: turn on XDP features") from the bpf-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 drivers/net/ethernet/intel/ice/ice_main.c index 433298d0014a,074b0e6d0e2d..000000000000 --- a/drivers/net/ethernet/intel/ice/ice_main.c