From patchwork Tue Jul 21 01:55:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1332720 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=rzD/T6Bp; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B9hWv3RNGz9sTC for ; Tue, 21 Jul 2020 11:55:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726553AbgGUBzu (ORCPT ); Mon, 20 Jul 2020 21:55:50 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:39919 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725857AbgGUBzu (ORCPT ); Mon, 20 Jul 2020 21:55:50 -0400 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 4B9hWl2mDPz9sRN; Tue, 21 Jul 2020 11:55:47 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595296547; bh=TI85x241LSmUe5XSIcekXqnHuC4GGWRab8yFSyRxlcA=; h=Date:From:To:Cc:Subject:From; b=rzD/T6BpJhz2r+IQFX9QKORBhyA5HAbA7+b4IQmdYhQ9008KKKBjb1hlf1NWGLkMJ JOXwGUSHbXajBkfZu1PlocMtvP/ZdZ9p8VppMstdnbtzj6cMtuWyKCL1zqGmzs5OM7 pTWHcYD6Au+3oPPLDI+M4ql1NY1p6uNwPK6kOPr3Nfa13vTu9QSqslAawD6C+2p8gZ yX8bDrdU2qwZuTtlPHLIkruDRW8r4UA7qdARBJhRH4SYMfk5VRSIg/e7hc0s2gqCL/ LXbxafwNdv6upHrRwRRjQ6kQVs98Gs0lbpwAjA2TjLHplbxH0IDByLWaMQv/BQUUI5 kvu9garkZNOOQ== Date: Tue, 21 Jul 2020 11:55:44 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Nikita Danilov , Pavel Belous , Mark Starovoytov , Igor Russkikh Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20200721115544.338fa4c1@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: 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/aquantia/atlantic/aq_hw.h between commit: 23e500e88723 ("net: atlantic: disable PTP on AQC111, AQC112") from the net tree and commit: 1e41b3fee795 ("net: atlantic: add support for 64-bit reads/writes") 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/aquantia/atlantic/aq_hw.h index 992fedbe4ce3,95ee1336ac79..000000000000 --- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h