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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 056E1C636D7 for ; Tue, 21 Feb 2023 17:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234597AbjBURFX (ORCPT ); Tue, 21 Feb 2023 12:05:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234187AbjBURFV (ORCPT ); Tue, 21 Feb 2023 12:05:21 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D9942A6E1; Tue, 21 Feb 2023 09:04:59 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9415360F82; Tue, 21 Feb 2023 17:04:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 911F4C433EF; Tue, 21 Feb 2023 17:04:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676999098; bh=hAEQa0Cu32XX4S5t98j4S5gV6lruGeDQSN/4bgvhn/A=; h=Date:From:To:Subject:References:In-Reply-To:From; b=Ww6WfLdupADK0MXFIBnDSmjGalJXiMhimIkN+R4Rkl1zvQcxVgkl9l6c0/DzjWE/n TDhyDNklDu3+5PlyMk98AAFHGbmbMwwSNVSo+/EQ08lSPLGKpeH5rsv0DzsJAa+z8y ch+3PaKDBB8al2GFd/mpDBmvuJIuteHClzR3TKr5oIYBL5rsx8ET3NftGmBASbxFsj IglR6c560Ivtx+lMiux+/35+/J4m2COluMH0OHby9txUMP9GKvT0iNpCSSetJvoEZS X/R04jVPJbBc0rMJV8k336bpWY8+Atc9NAZ6AdoWkalqWbq26D5OqxEeh8c+ynKHlF iJjP3bda0I3TA== Date: Tue, 21 Feb 2023 17:04:53 +0000 From: Mark Brown To: Wolfram Sang , Stephen Rothwell , Geert Uytterhoeven , Linux Kernel Mailing List , Linux Next Mailing List , Wolfram Sang Subject: Re: linux-next: manual merge of the spi tree with the i2c tree Message-ID: References: <20230216113035.3050871a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="KAJzZplwoo3a+Wx5" Content-Disposition: inline In-Reply-To: X-Cookie: MOUNT TAPE U1439 ON B3, NO RING Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --KAJzZplwoo3a+Wx5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Feb 21, 2023 at 05:57:41PM +0100, Alain Volmat wrote: > should I update something to avoid this conflict before you push the > pull request for v6.3 ? No, it's fine. Please don't top post, reply in line with needed context. This allows readers to readily follow the flow of conversation and understand what you are talking about and also helps ensure that everything in the discussion is being addressed. --KAJzZplwoo3a+Wx5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmP0+bQACgkQJNaLcl1U h9Dwjgf+JImyOC1iwoQTkysyQOyUpH4SoFTff9yxJz8dB6gDovtG4b5qktoSO29W sx7F8yYiri0iZSccTA+uaO6OpTVZa+Wnna+zN4EgTBoC00uGhWP/Xo7iutX7O1p3 MQ8dYev2imIAH+SfddS67eP11OxfNvV3bLYCwGiWWYJ3bxHDGpBqm44o/vOoy5UD LLQAYFlgDJdJl0z8w9saRiiCRPDfh1xhyEFc2rMQtu2AulDX5H2+7yKSA44vbLy9 V2ukLqNOXfNTOzkVMZCeKMmJYlY/vc72p+3ndFJqT3J+/XinNVKUJUud1psC6WFF r4gDQgKjVx4RD9GYJvJ+JkPI3c6M5w== =gK+/ -----END PGP SIGNATURE----- --KAJzZplwoo3a+Wx5--