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=-10.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 97602C433E6 for ; Mon, 22 Feb 2021 23:57:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 687A564E15 for ; Mon, 22 Feb 2021 23:57:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231661AbhBVX5w (ORCPT ); Mon, 22 Feb 2021 18:57:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231656AbhBVX5v (ORCPT ); Mon, 22 Feb 2021 18:57:51 -0500 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAF12C061786; Mon, 22 Feb 2021 15:57:10 -0800 (PST) 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 4Dkzcg1GNRz9sCD; Tue, 23 Feb 2021 10:57:07 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1614038229; bh=U5lBCA5imuyW2behzsReiu6hPI8n+Ak13A6YUU800x4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=DFaLskWmy/OS4jLTkkk904cz9Zy/OIMwybHJzqeApl7cO9HWUALQ/83LA2MPQWnkd ehbDOl1wn90NOocXeGnzn6Pk2HV3LYWaMtJLXQ0JgNd1pFJNlvzv2OZqvnrQaMWtYT Rf5isW2EZpj+qX/qYer8q4fKZ0DPcfwZUomYF1kD1ZLJM2UPhDh7WQGH/SJfd/ATpk DCix2kpNPs17MhyyOPJk4/+/E77/Ka8+QKauNZ9KPKcJkq2dzLtWws895kXzg4hMGA aqNG7NKRfVzP/KZYkvUcq16TsJFBLv4XYEWGMkjYxOEYFvSia71uOJxiMd47jcPU0H il8TbXv633qtQ== Date: Tue, 23 Feb 2021 10:57:06 +1100 From: Stephen Rothwell To: Michael Ellerman , PowerPC Cc: Mark Brown , Christophe Leroy , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the spi tree with the powerpc tree Message-ID: <20210223105706.1a57be06@canb.auug.org.au> In-Reply-To: <20210212152755.5c82563a@canb.auug.org.au> References: <20210212152755.5c82563a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/NYDmyQxYEcZbJPIOnMi8qJp"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/NYDmyQxYEcZbJPIOnMi8qJp Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Stephen, On Fri, 12 Feb 2021 15:31:42 +1100 Stephen Rothwell = wrote: > > Hi all, >=20 > Today's linux-next merge of the spi tree got a conflict in: >=20 > drivers/spi/spi-mpc52xx.c >=20 > between commit: >=20 > e10656114d32 ("spi: mpc52xx: Avoid using get_tbl()") >=20 > from the powerpc tree and commit: >=20 > 258ea99fe25a ("spi: spi-mpc52xx: Use new structure for SPI transfer del= ays") >=20 > from the spi tree. >=20 > 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 > diff --cc drivers/spi/spi-mpc52xx.c > index e6a30f232370,36f941500676..000000000000 > --- a/drivers/spi/spi-mpc52xx.c > +++ b/drivers/spi/spi-mpc52xx.c > @@@ -247,8 -247,10 +247,10 @@@ static int mpc52xx_spi_fsmstate_transfe > /* Is the transfer complete? */ > ms->len--; > if (ms->len =3D=3D 0) { > - ms->timestamp =3D get_tbl(); > + ms->timestamp =3D mftb(); > - ms->timestamp +=3D ms->transfer->delay_usecs * tb_ticks_per_usec; > + if (ms->transfer->delay.unit =3D=3D SPI_DELAY_UNIT_USECS) > + ms->timestamp +=3D ms->transfer->delay.value * > + tb_ticks_per_usec; > ms->state =3D mpc52xx_spi_fsmstate_wait; > return FSM_CONTINUE; > } This is now a conflict between the powerpc tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/NYDmyQxYEcZbJPIOnMi8qJp Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmA0RNIACgkQAVBC80lX 0GxdFggAlfolbgn5bq51VTyZ+1tyiXa8aezsnmPSQvuwqiHkoa3ZPjBersgqLAul MH9DvEjqXpvRnFIqiDoeTmUA/tc4HYNncv+s/NrV+iBjwmtCoK5umm5kdwjgENGL nh5BnuIRG9mFSo/KKrHhhJYgJ1PwLC0uto5ou7fw7eLf5RqYlK/mx1Gl/kBWojgx NvxY8QE6iXyE+4pSaXo/rOR45n5VwrczgnKE8LsY79yNXfpYTPkQYoS/tGqAPh9K m3KcGO9Y2co27EO8YPw1KXNAhDW3k5uNCAqoapnnPKcKnx1zrDOxMhflo8XMNPU2 LvtNSsm091rgYgW4c9s0JYQTLphTtw== =GXwL -----END PGP SIGNATURE----- --Sig_/NYDmyQxYEcZbJPIOnMi8qJp--