From patchwork Thu Jan 21 02:26:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12034279 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89997C4332D for ; Thu, 21 Jan 2021 02:57:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BBE023888 for ; Thu, 21 Jan 2021 02:57:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392736AbhAUCtq (ORCPT ); Wed, 20 Jan 2021 21:49:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436844AbhAUC1d (ORCPT ); Wed, 20 Jan 2021 21:27:33 -0500 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F7FAC061575; Wed, 20 Jan 2021 18:26:51 -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 4DLmVZ2Nctz9sW4; Thu, 21 Jan 2021 13:26:46 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1611196008; bh=adam7o31byAmsNO7PyJ+PTMYjYvnxJ3L+Eo0CAo9M+M=; h=Date:From:To:Cc:Subject:From; b=TzN/DIkCkWPSi6nhvSZKyGdEfEGkuTL+dt3TYTumpJ/E8aW+UoBqUhGSnm38vYG/g 5wgPobZ9dnhykV6S86sdD1Nine931g4zpMdY/TZAq2dAQ01nRk3Gix4+LCC1QqlbP9 aFHiNXGgqaz48wkAjrFlVTjjg/P8XXLw8Y8fr6tibMrbeQKyCgw1XhKtL1EsJRYxf2 NTjyH4dkJ2s+KPZvfYVEwewVgNLsdNHu4ftwrInhfaeD/84YgOInposJ91gU+sMQJY MEm5141mLGIgRyeauiRxZKswGDaZw48TNSv3OgI/KnvrfPOVG8wXbTd5EBpEFuXoxi E/YoAzU3Ad6SQ== Date: Thu, 21 Jan 2021 13:26:45 +1100 From: Stephen Rothwell To: Rob Herring , David Miller , Networking Cc: Grygorii Strashko , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List , Rob Herring Subject: linux-next: manual merge of the devicetree tree with the net-next tree Message-ID: <20210121132645.0a9edc15@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml between commit: 19d9a846d9fc ("dt-binding: net: ti: k3-am654-cpsw-nuss: update bindings for am64x cpsw3g") from the net-next tree and commit: 0499220d6dad ("dt-bindings: Add missing array size constraints") from the devicetree 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 Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml index 3fae9a5f0c6a,097c5cc6c853..000000000000 --- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml