From patchwork Tue Oct  4 01:11:07 2022
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: 12997906
X-Patchwork-Delegate: kuba@kernel.org
Return-Path: <netdev-owner@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 56389C4332F
	for <netdev@archiver.kernel.org>; Tue,  4 Oct 2022 01:11:17 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229621AbiJDBLP (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Mon, 3 Oct 2022 21:11:15 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58640 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229556AbiJDBLO (ORCPT
        <rfc822;netdev@vger.kernel.org>); Mon, 3 Oct 2022 21:11:14 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12C3114090;
        Mon,  3 Oct 2022 18:11:12 -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 4MhKQj3bzdz4xDn;
        Tue,  4 Oct 2022 12:11:08 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1664845870;
        bh=4bxGGTMu13dnzgcclih/sMnhB87pdwZTVYBryKLacfM=;
        h=Date:From:To:Cc:Subject:From;
        b=mWTId7ahfCfMzPw2a49aCYdf6WwXNHf1n1pmVk41eQfq29kK2eCLUo8mvaG2BkTF2
         7/OS8n5CpzRpf7GKkQ5DGJICWqQx6ojBp3jrs+afkMENfl0bvRNoCnMuY/Em78igEW
         D2juG/NlelyXwzO9p6xLifoJ8B5QzEGRTPCc2LdtisgyySHcyjIRCizHNlTcLMFxoN
         ZHiJD8mqKxQd7ufcez4SZZBYwkI/IH7hO52on0nLOzQlW/m7Y0iDRLRcw/aBFdaU/h
         ya74/C0WrTdW3neZYm1wV1hAOFZ+0MQQXrZdsQYpaB72EY1xAwDrVXpNNkpxAkbRyT
         JD7dbiWeuLeFQ==
Date: Tue, 4 Oct 2022 12:11:07 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: Networking <netdev@vger.kernel.org>,
        Daniel Golle <daniel@makrotopia.org>,
        Jakub Kicinski <kuba@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lorenzo Bianconi <lorenzo@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20221004121107.5dd88137@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 net-next tree got a conflict in:

  drivers/net/ethernet/mediatek/mtk_ppe.c

between commit:

  ae3ed15da588 ("net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear")

from the net tree and commit:

  9d8cb4c096ab ("net: ethernet: mtk_eth_soc: add foe_entry_size to mtk_eth_soc")

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 drivers/net/ethernet/mediatek/mtk_ppe.c
index 148ea636ef97,887f430734f7..000000000000
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c