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 921BCFA372C for ; Thu, 7 Nov 2019 04:05:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64B332178F for ; Thu, 7 Nov 2019 04:05:57 +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="IfDSYKKh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733132AbfKGEF4 (ORCPT ); Wed, 6 Nov 2019 23:05:56 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:55003 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727280AbfKGEF4 (ORCPT ); Wed, 6 Nov 2019 23:05:56 -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 477qZS0FHWz9sRY; Thu, 7 Nov 2019 15:05:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1573099552; bh=2QapZZxv0w8eOLKWxJmjSRY76XAd4sqlYoTQLOXOZ5c=; h=Date:From:To:Cc:Subject:From; b=IfDSYKKhh2+ECCeQVSboLI/gjCCp9JnwwSYuM3D9CXDKQaW6/vJWvNRU2F9ypRzNW y8EL4qYZoMgOJoF06a0E94HW9Wz5WzjOC6TQo+rrjxqjyfdPOABNQ2e+xJLzJPQ4vi pW2oekPtX+ZVcGqCGSttDV3rOyO6AGgExUOhMi859vj7XhB/XXm35TQ9JnZf7WJQXI XlBHs+67ExtYC1wEJpD3M+QtbJpWaUhMX6woonG4nK0TcU1b8v3ApsNeDUhtv/vsK8 sk5TA0661D21+f+WVHNLTm9Q/JBMim91nV6ODfPQxlCDDZpXgXa45GvCsm7w+tf3cV R+7f/P8YYH1vA== Date: Thu, 7 Nov 2019 15:05:50 +1100 From: Stephen Rothwell To: Linus Walleij , Greg KH Cc: Linux Next Mailing List , Linux Kernel Mailing List , Bartosz Golaszewski , Thierry Reding Subject: linux-next: manual merge of the gpio tree with the driver-core tree Message-ID: <20191107150550.15df2f35@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/SJ98=elDCbAvM+46dv4d8lv"; 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_/SJ98=elDCbAvM+46dv4d8lv Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the gpio tree got a conflict in: drivers/gpio/gpio-tegra186.c between commit: cc4c831811c2 ("gpio: tegra186: use devm_platform_ioremap_resource_byname(= )") from the driver-core tree and commit: 2a3655056730 ("gpio: tegra186: Implement wake event support") from the gpio 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpio/gpio-tegra186.c index ef40fbe923cf,8a2a69178925..000000000000 --- a/drivers/gpio/gpio-tegra186.c +++ b/drivers/gpio/gpio-tegra186.c @@@ -407,6 -449,8 +449,7 @@@ static int tegra186_gpio_probe(struct p unsigned int i, j, offset; struct gpio_irq_chip *irq; struct tegra_gpio *gpio; + struct device_node *np; - struct resource *res; char **names; int err; =20 --Sig_/SJ98=elDCbAvM+46dv4d8lv Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3DmB4ACgkQAVBC80lX 0GypaAf/cmF8EFtMCIWMpVN3p4PS3N1FaIKHp2iH+ehuV7yYdrjcnTgZPKTZeRUs N7HitAcXJZZp3P7+HRMBN4QxVorshnQ+KSVTfvrOTEVMlfWm5bQBBaShv9Uk8ZOy PpBGg9cE6lL23btDY0Tu9n8r17NhP+fcFLOxr/Nw3LF9jVAQG2aYbq8z6lS0Gdqd tT8HBY22+EDxbR1W2+IOizhkHJ/BFl9NSvjOY3J4aHSVQ1M8pbYQUTMkJWnd8LWf SMfQiBbgdP+mabqKe0EHzfBZeFI0oNYHXjM1qEN+Ep/H/LDoDESDnsPIiy1H5KPV B9VzvT+SlH67jbwRj3YLjhARFLN1ZQ== =E2cZ -----END PGP SIGNATURE----- --Sig_/SJ98=elDCbAvM+46dv4d8lv--