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 <sfr@canb.auug.org.au>
X-Patchwork-Id: 13130761
X-Patchwork-Delegate: bpf@iogearbox.net
Return-Path: <netdev-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 5EC0CC64EC4
	for <netdev@archiver.kernel.org>; Mon,  6 Feb 2023 23:19:59 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229588AbjBFXT5 (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Mon, 6 Feb 2023 18:19:57 -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
        <rfc822;netdev@vger.kernel.org>); 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 <sfr@canb.auug.org.au>
To: Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Andrii Nakryiko <andrii@kernel.org>,
        David Miller <davem@davemloft.net>
Cc: bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>,
        Kumar Kartikeya Dwivedi <memxor@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lorenzo Bianconi <lorenzo@kernel.org>,
        Marek Majtyka <alardam@gmail.com>,
        Michal Swiatkowski <michal.swiatkowski@linux.intel.com>,
        Tony Nguyen <anthony.l.nguyen@intel.com>
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
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

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