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 51DD5C433F5 for ; Sun, 19 Sep 2021 22:44:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 328A760F43 for ; Sun, 19 Sep 2021 22:44:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233018AbhISWpj (ORCPT ); Sun, 19 Sep 2021 18:45:39 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:35395 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230007AbhISWph (ORCPT ); Sun, 19 Sep 2021 18:45:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1632091449; bh=azW0vTWeXjKrp+nWcpcWoQH0dQ4Zj2LkwPHFkRLJUEA=; h=Date:From:To:Cc:Subject:From; b=poi7YlRxYGa5XISYPb0qQPxUI+MhTagpWePVKzQEfwKnEgheTcI9TWUmhXH9lyItu gVa7CEmFZxRMIq3X2Pb+hupfTDvcnZjLaXYJtQ2mWHUu9eI3ikiFzFRIELzhjla186 TQho6Aqpdb9bpWNsGqdsjJhEmL91cjJG3ZsbkMVuA1xILZUAKpsbk8HCdGvslfFg3A 0qjXvwFHNTqMk45xzoSnQ6v6swd+TGz9z0FsbtSav7npNBMzu/sT2FLuk2UgpAnNrE 9bHdcMs3qxCO2DbtC9dCAEKnr4HLcLkRDCgRLDKI7Cc8+4hJEWVGwKrvr6zQL6KLKZ B0HnZKTfksBBg== 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 4HCN612Jj5z9sW5; Mon, 20 Sep 2021 08:44:09 +1000 (AEST) Date: Mon, 20 Sep 2021 08:44:08 +1000 From: Stephen Rothwell To: Mark Brown , Linus Torvalds Cc: Guenter Roeck , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the spi-fixes tree with Linus' tree Message-ID: <20210920084408.4c93f5a1@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/DwFuqR+d6yJTJJqRrDGl3MD"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/DwFuqR+d6yJTJJqRrDGl3MD Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the spi-fixes tree got a conflict in: drivers/spi/spi-tegra20-slink.c between commit: efafec27c565 ("spi: Fix tegra20 build with CONFIG_PM=3Dn") from the origin tree and commit: 2bab94090b01 ("spi: tegra20-slink: Declare runtime suspend and resume fun= ctions conditionally") from the spi-fixes tree. I fixed it up (I just used the letter version as that has been in linux-next for 10 days already) 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. Mark, maybe fixes need to move on to Linus a bit faster? --=20 Cheers, Stephen Rothwell --Sig_/DwFuqR+d6yJTJJqRrDGl3MD Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmFHvTgACgkQAVBC80lX 0GzmMAf/YK3TpOTyiy/Ha7o3ONjQ71Rxvw5TgCBbu5R+hVY5+IJAf9atqZPXgfR3 sP050uVoRBFVVney4luiPlSM4tmoXCAeIYsqDIqvPufn3f157T5eLx1qtcZ4tTAY fc89Ks5zkzHO7PqYRRFiAY4LrkeCEVvsD8kRii8IGi+2Q9xL/3BcAXy62wvxyaz4 Tr3VwRPHDzhpqcgBuLWe5Q9+3pleT7lplFVotE/cu+NZ3bY+I8L367aKIU9qszkp Pczk1bcgNvoyXJG6yfckUuh6vzBaHaDTwFjYSmBgwWtmJpKjgiHgVp9S0su04YFQ BcbQCRsEZaA7xyBrrWGKNeSM+djQvw== =BfFW -----END PGP SIGNATURE----- --Sig_/DwFuqR+d6yJTJJqRrDGl3MD--