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 ACB10C432C3 for ; Fri, 15 Nov 2019 04:45:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83729206E6 for ; Fri, 15 Nov 2019 04:45:00 +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="UqVjFT6j" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726958AbfKOEpA (ORCPT ); Thu, 14 Nov 2019 23:45:00 -0500 Received: from ozlabs.org ([203.11.71.1]:48885 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726549AbfKOEo7 (ORCPT ); Thu, 14 Nov 2019 23:44:59 -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 47Dm3s3Z3bz9sP6; Fri, 15 Nov 2019 15:44:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1573793097; bh=2IT7kQyS7HUi89J83sS/Y6EzE36k0O7rOWKgl9xBC/Y=; h=Date:From:To:Cc:Subject:From; b=UqVjFT6jZefTcgkWnqpQdeeiuapcBnA19gk9Isnfq9+9Na4PP/iutpqH7Jx3nWqEK Ty9FMmonrbDj8jfULZ20e/xqocg6QZzo3CeVZ/Kf8QyuSLD9Qug0+s+4D1srMSBicK sANM55jy9b8cqYkP5uAhRG5l4AHaC67PhoeP0uDfri5LxvXFQr3m7LkzI8GaxSt0Q5 ZxsUuR+Oki3hfI3IhKbCfKS9/DfHJL1vhq2Ab1b3gCBQtoPRwVvrw5vIs0EqtibiXo zmtoi5q1crRQ5RPGBHbCq4PgWcf0JEzmozL/BImbfqh/M3TLjT9GPAPz4guLXGjsRW 9wtPdCHq7Ko3w== Date: Fri, 15 Nov 2019 15:44:56 +1100 From: Stephen Rothwell To: Thierry Reding , Rob Herring Cc: Linux Next Mailing List , Linux Kernel Mailing List , Benjamin Gaignard , Fabrice Gasnier Subject: linux-next: manual merge of the pwm tree with the devicetree tree Message-ID: <20191115154456.244c27e4@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/RyIrEUa4PrOL3P+S8eK5+Yh"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/RyIrEUa4PrOL3P+S8eK5+Yh Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the pwm tree got a conflict in: Documentation/devicetree/bindings/pwm/pwm-stm32.txt between commit: 56fb34d86e87 ("dt-bindings: mfd: Convert stm32 timers bindings to json-sc= hema") from the devicetree tree and commit: 4205e356285e ("dt-bindings: pwm-stm32: Document pinctrl sleep state") from the pwm tree. I fixed it up (I just deleted the file - more fixup is probably required) 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_/RyIrEUa4PrOL3P+S8eK5+Yh Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3OLUgACgkQAVBC80lX 0GzU2gf+PT9N1c5iWBlI7Fz+cTmIEOoRDiTnRPH+F6HNsJrHCA397ENwXZldksVq +ocghgddSJILnIRUBhMygIDEbwAenf3avYHdWuXjhTm/8uJOwWULbZWx/uEQiUkA gEkgX437WGv7OsmZMuk55S6bCCVW822ZT4EkNGawgwDRhwV5PD8mYkIkX2tk2O/E a2qY54g0PztvfiFYV1rv1unvAHv44YVW5Pm1I6JCOCBs8+57vHSXEwjPBGIadOLk TLuR5imLGueOtddv3eM1eldaSqQTF5M37GA1qc6TEjO9MWhrXGeu6nSCmbF/Vcm1 BP7QAQkFcP4iYSSD7+KcayA1oJcBKQ== =n2vS -----END PGP SIGNATURE----- --Sig_/RyIrEUa4PrOL3P+S8eK5+Yh--