From patchwork Mon Apr 18 23:34:34 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: 12817161
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 CAE38C433F5
	for <netdev@archiver.kernel.org>; Mon, 18 Apr 2022 23:34:42 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S235370AbiDRXhV (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Mon, 18 Apr 2022 19:37:21 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50450 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S234905AbiDRXhU (ORCPT
        <rfc822;netdev@vger.kernel.org>); Mon, 18 Apr 2022 19:37:20 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFB3327CD2;
        Mon, 18 Apr 2022 16:34:38 -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 4Kj3Dr4N2zz4xNl;
        Tue, 19 Apr 2022 09:34:35 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1650324877;
        bh=/AeN/7aJIIso3ET4fMDtzGqTqxQGLuQTHEy8Tnj+Qh0=;
        h=Date:From:To:Cc:Subject:From;
        b=Orh87OQ3tq0CwVqFvHXAFQTBNqZWBQTQ/HVJJE0qQlPv961AWzRcbEIdK/VnVsJTH
         FJ71EFObrYUmH+oit+iJ8nK7Yl50hBPBwuYT7nMCha+g6c4FJZ0SLWaZlLHCVIVswo
         JNR34iG8wlYwcSeo3TNvMmSPctHpVJbgEdggpdXEqNQsrKOTbFyNKO/F1diR9IkOHK
         YU20CiYZeQjRFy7C67oO/YT9qEgq99FvU11x3yAj4IAc95lfmMUszFNsLRe8s4rF12
         PWZUEnau9HZ8q/PC8KahlUIVVcZiHY+voMyP722e/X5I/J2qDcirSaszCKxwZNPYfj
         +MaROILBvmoVw==
Date: Tue, 19 Apr 2022 09:34:34 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: Networking <netdev@vger.kernel.org>,
        Horatiu Vultur <horatiu.vultur@microchip.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20220419093434.299253fc@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/microchip/lan966x/lan966x_main.c

between commit:

  d08ed852560e ("net: lan966x: Make sure to release ptp interrupt")

from the net tree and commit:

  c8349639324a ("net: lan966x: Add FDMA functionality")

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/microchip/lan966x/lan966x_main.c
index 95830e3e2b1f,106d8c83544d..000000000000
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c