From patchwork Fri Sep 11 01:17:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1362147 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=t8LQWBMz; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BndCv2J3cz9sVF for ; Fri, 11 Sep 2020 11:17:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725790AbgIKBRm (ORCPT ); Thu, 10 Sep 2020 21:17:42 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:44909 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725280AbgIKBRl (ORCPT ); Thu, 10 Sep 2020 21:17:41 -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 4BndCg1g9Cz9sV5; Fri, 11 Sep 2020 11:17:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1599787057; bh=LWyAdIS7WVTbxNr2SjDaV0cpjjjBFUm7NK4RyJZ+7Pc=; h=Date:From:To:Cc:Subject:From; b=t8LQWBMzi/l4dMpI8k8CyXYUqi5ON4wyS4mjbZLkSvLAI/7zW+nixIrMVVOJWTJfR IyggRjIP8tqba89IaB+0OnF0S6XjRxCIV72E1pLhccW6Y5Md+62V8RlLjxpBaMka/h WbvUCbG7hrUvo7rQV8rt2ww4YBrpI2UHvF4hDmSMA2I8KiIZSlSLFzae5f9KkD59YH MAfYpgELwGhiYIFRX921griXXMqdL9AYglrlcoOq44WDgDxm0BFyTtIhpHgPzshc7T y5Gulti2SlReie66DH0pPd4/yJd9hhE9tG3IFEu9Sl3QHmL50GUBMNwLLIwuQlIbCa hJyTaZYd4kIkA== Date: Fri, 11 Sep 2020 11:17:31 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Helmut Grohne , Paul Barker , Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20200911111731.48a324d0@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/dsa/microchip/ksz9477.c between commit: edecfa98f602 ("net: dsa: microchip: look for phy-mode in port nodes") from the net tree and commit: 805a7e6f5388 ("net: dsa: microchip: Improve phy mode message") 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/dsa/microchip/ksz9477.c index 2f5506ac7d19,b62dd64470a8..000000000000 --- a/drivers/net/dsa/microchip/ksz9477.c