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=-5.8 required=3.0 tests=BAYES_00,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 13044C4338F for ; Tue, 17 Aug 2021 10:07:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E59FA60F38 for ; Tue, 17 Aug 2021 10:07:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239303AbhHQKHr (ORCPT ); Tue, 17 Aug 2021 06:07:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239342AbhHQKFp (ORCPT ); Tue, 17 Aug 2021 06:05:45 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CED8FC0613C1; Tue, 17 Aug 2021 03:04:19 -0700 (PDT) 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 4GpmpN6Zl8z9sRK; Tue, 17 Aug 2021 20:04:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1629194656; bh=a5vBp05i0w+6dipIg/OspEpX80RBiZzeW3gLpgTDYE0=; h=Date:From:To:Cc:Subject:From; b=K736wvBQAeOMYhW10/5rrjSZ0i3XBaHadyADeMa2KvCD2r6N/rLWEo9FSRtlzKfQz BRjjB5VkmBqeueLPuU2RTI71bUN36yjPlWKUF+00I5he1RhxoVsf+/gqb3YD9ObWEG KH/qhzZASWAD8DbSi/dEUjaTcKvxRQe2NO1jNwr6QoZRN8qxXsJu8ZjrfxX1CmF8Tl 6g1qkZ60QIkNLf0V7FRxt19aqS8J7SF2pzl65OUytMpx7nYmMbEYHU7jMrHKf/Ukx5 JgmMFFjdCWnUuuv+9SHt9VA4lOqzSix0R2io4NA+lhUI4lNK2EQV/BI77QUdwSV+P3 685o3HSsupGAg== Date: Tue, 17 Aug 2021 20:04:12 +1000 From: Stephen Rothwell To: Linus Walleij , Marc Zyngier Cc: Jianqun Xu , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the pinctrl tree with the irqchip tree Message-ID: <20210817200412.799bd992@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Hk5d0=.3ZZ3m5bQKIuoxfeR"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Hk5d0=.3ZZ3m5bQKIuoxfeR Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the pinctrl tree got a conflict in: drivers/pinctrl/pinctrl-rockchip.c between commit: a9cb09b7be84 ("pinctrl: Bulk conversion to generic_handle_domain_irq()") from the irqchip tree and commit: 9ce9a02039de ("pinctrl/rockchip: drop the gpio related codes") from the pinctrl tree. I fixed it up (the latter removed the code changed by the former, so I did that) 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_/Hk5d0=.3ZZ3m5bQKIuoxfeR Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEbiZwACgkQAVBC80lX 0GzAbAf6A+vnqy0crTp/QZiL6Xjw4grziQBJCjgtIDxS7BFqhnc5ls74lS3Wy070 q2goxA6C34fX3QAAfVFPJ81Gs6kv+5fIxWwKhnmHPVSGY+2b0hn0WjPzkrF2Jt3t h/pr9/AA3CEuym7kccPEsZ7GqSDLjFi4SO3aaG/nSGSHIwvQtU7ekDVnVBPfvZw2 NENUQ46TQVOa3Odf/IT0/Sr7kc6BMuZ1JLXqDI+JPrTxHgYIkfj7KNQfaM7zOVgq FeLwOlijtyUO/bnSxmpNoInnxgCs+NCwhJde7trzD0E4RmOIftecN3i9bISrIxup 8eok8uLCu6fWicQVD+UjcA0zWCOTeQ== =uzMx -----END PGP SIGNATURE----- --Sig_/Hk5d0=.3ZZ3m5bQKIuoxfeR--