From mboxrd@z Thu Jan 1 00:00:00 1970 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=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 5BBC4C43215 for ; Thu, 28 Nov 2019 00:41:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28828215F1 for ; Thu, 28 Nov 2019 00:41:31 +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="fHFOawqR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727165AbfK1Ala (ORCPT ); Wed, 27 Nov 2019 19:41:30 -0500 Received: from ozlabs.org ([203.11.71.1]:54779 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726947AbfK1Ala (ORCPT ); Wed, 27 Nov 2019 19:41:30 -0500 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 47Nf2v6CWVz9sSJ; Thu, 28 Nov 2019 11:41:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1574901688; bh=sd4/QC2DtC86zW3ryXuf/Oon6IKrF+GBxFj+ksxiPzU=; h=Date:From:To:Cc:Subject:From; b=fHFOawqRPSe3cfV+gZ6WApii2EeCLFqIAKnHWo3p75dEJM96a377VobIZcBm6xUIf 0EsZdMtnvCx4/cLvj2gXbQYPa+BlcOWzxdkRpuMjDYqSFD7WImwjlFwp8YA/i/jAvz scXny0khhEuCI/0hPKuT+y+CmDb0HmAOFicXumir1BkvbsmUJMvULjB0q0fk+5TZGf uzxsyyEmpy+IJNH0Am5W0GhXLk+NJ5SlCa/PnHMF2aIvQP23prlyCqiUuwXLBg+cQP 4IO9g15puXssuH+a6HCTnt7X6xFDJMenVNgevbLGMEbzIftHciWhFoGWcLH9SkV8Nt nMKDVGlFIhXAw== Date: Thu, 28 Nov 2019 11:41:27 +1100 From: Stephen Rothwell To: Jassi Brar , Rob Herring Cc: Linux Next Mailing List , Linux Kernel Mailing List , Arnaud Pouliquen , Fabien Dessenne Subject: linux-next: manual merge of the mailbox tree with the devicetree tree Message-ID: <20191128114127.0f1e3b06@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/SuKzyasq5wvNffpko8PqMji"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/SuKzyasq5wvNffpko8PqMji Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the mailbox tree got a conflict in: Documentation/devicetree/bindings/mailbox/stm32-ipcc.txt between commit: 4360bf724483 ("dt-bindings: mailbox: convert stm32-ipcc to json-schema") from the devicetree tree and commit: 9b2cfd3fb09e ("dt-bindings: mailbox: stm32-ipcc: Updates for wakeup manag= ement") from the mailbox tree. I fixed it up (I just deleted the file - presumably there will need to be followup fixes to the json file) 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. --=20 Cheers, Stephen Rothwell --Sig_/SuKzyasq5wvNffpko8PqMji Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3fF7cACgkQAVBC80lX 0GwLYQf/emideZaY5M6Jnfk8OIRnEQAB6SNldtdMGUjBgHzw+z6NDiKLe2vsP0c4 +NdFaTx6+FfP/gua8ZbvDZhmIqcci0Hht1cHEM1FdIQcG7xCkjItnvqkt8jyvUuF qRC8n6yR/mRaTNK+Jf/t3QX0nQcn8l3m1cOJsuEssqdJoLU4dEoVzvL+j6AINJgu KlpUgXsr/KuRF4ZInIsbvUK7Nl++EO5RcM9q6PQJmk3ViYOPsheV5XCHfC7DGk8y ao2V3kB1gbK+PGdKpoYfxgzC93d1/TbXaCWeF+Y9rBPJ7fahGNmzxeL/b7pM+cW0 mKiqXfHQ4FgE7llu1nxb8NFIDiE0gg== =x9/m -----END PGP SIGNATURE----- --Sig_/SuKzyasq5wvNffpko8PqMji--