From patchwork Fri Oct 2 03:02:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 267734 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=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED 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 B2A74C4727E for ; Fri, 2 Oct 2020 03:02:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E99C206E3 for ; Fri, 2 Oct 2020 03:02:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="HDtakTJP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387608AbgJBDCq (ORCPT ); Thu, 1 Oct 2020 23:02:46 -0400 Received: from ozlabs.org ([203.11.71.1]:33575 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727780AbgJBDCq (ORCPT ); Thu, 1 Oct 2020 23:02:46 -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 4C2ZYC59Bbz9sSn; Fri, 2 Oct 2020 13:02:38 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1601607762; bh=j53jquxv8eIAVcycClyih3HfZma6HX/HBe3EZidk8Vs=; h=Date:From:To:Cc:Subject:From; b=HDtakTJPdDRTtFG+PENzQYZTKweVWPbsyJpb3IFvuXGx6Xt8bkCRVEJ8XHnZJiOlB LK9qxo4WSfVGFmWfB+v7vVqAjCKpftnRrLPDVREc/bpIm1KDZPwa5iNMInSadrBBkl WL2ixftGxEQt5wp2Apcr62UI47Syhf+814XGI31zJkNjwzdj2vPSaCTR6GaWpy2RVq 8MXFkWLop3HfzmBdKr2Rva4XOHmnIbXg8NJyRUSQBQyfoFeZACrxi2lZunMkVS64F2 F7Hr6x2PwiiXzUJBcIJbdCkOGdQFcYzQiq2AV/3xSKQFp/9uAHf6Vyj/6b7gAEnfc6 fcsn8eCvGhXHg== Date: Fri, 2 Oct 2020 13:02:37 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Geert Uytterhoeven , Lad Prabhakar , Linux Kernel Mailing List , Linux Next Mailing List , Marian-Cristian Rotariu Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20201002130237.42fe476e@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 net-next tree got a conflict in: Documentation/devicetree/bindings/net/renesas,ravb.txt between commit: 307eea32b202 ("dt-bindings: net: renesas,ravb: Add support for r8a774e1 SoC") from the net tree and commit: d7adf6331189 ("dt-bindings: net: renesas,etheravb: Convert to json-schema") from the net-next tree. I fixed it up (I deleted the file and added the following patch) 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. From: Stephen Rothwell Date: Fri, 2 Oct 2020 12:57:33 +1000 Subject: [PATCH] fix up for "dt-bindings: net: renesas,ravb: Add support for r8a774e1 SoC" Signed-off-by: Stephen Rothwell Reviewed-by: Geert Uytterhoeven --- Documentation/devicetree/bindings/net/renesas,etheravb.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/net/renesas,etheravb.yaml b/Documentation/devicetree/bindings/net/renesas,etheravb.yaml index e13653051b23..244befb6402a 100644 --- a/Documentation/devicetree/bindings/net/renesas,etheravb.yaml +++ b/Documentation/devicetree/bindings/net/renesas,etheravb.yaml @@ -31,6 +31,7 @@ properties: - renesas,etheravb-r8a774a1 # RZ/G2M - renesas,etheravb-r8a774b1 # RZ/G2N - renesas,etheravb-r8a774c0 # RZ/G2E + - renesas,etheravb-r8a774e1 # RZ/G2H - renesas,etheravb-r8a7795 # R-Car H3 - renesas,etheravb-r8a7796 # R-Car M3-W - renesas,etheravb-r8a77961 # R-Car M3-W+