Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp2692220rwl; Thu, 13 Apr 2023 09:34:32 -0700 (PDT) X-Google-Smtp-Source: AKy350YtHZc5c7N5PJH0WwaaShMNQrsDhaJub6d8lPmkDw7/GsYB3+5y3ZXXQ4hxOm/WjurrdOKC X-Received: by 2002:a17:903:40cc:b0:19e:4bc3:b1ef with SMTP id t12-20020a17090340cc00b0019e4bc3b1efmr2458718pld.64.1681403671711; Thu, 13 Apr 2023 09:34:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681403671; cv=none; d=google.com; s=arc-20160816; b=yGyLSL1xVyHODYiQHmCTrUOxG9z2ldymIE+I4NB0kC3FoKOgvGh3AqdbRbiEPu5+L9 bFiRiTjq75zoUOybmpQ3qzllRxBQUW18AoSbX7Jadte5cT1cavN6XVEO73tvhmdbvQdV XzmCgaL9zMRYyDZIORW9OaUgFaMlV/G4JCYjd0jtSMS7HnnOFLFOUyax5+WCmSXjqaoD Vx40kVK6g1J4VfzQddaVZp4tHj0nTve6V3/IvQNn4FS5FPtGsNMEjVsEgPPuqo8fFmoS T86wJEJLOWP/vQgG63du/dn7LC9RLzmoGaUNAQyTNqKst51h7CSCDzx+SNPzyATMJLOG iTxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=QlJC1VnlDqNMkOB0WVwmOXFtD2pyMcnTOdtZqWQzufk=; b=ujbQBNd2qqK9kn/p+EBOKzUZjTUAS+eDJ0YRDxDevOh3ybDzR0T/bXnSeABOAf+T6A hh1FfYzxJ5y9U+5DeHEAldTFRlQAOhYGnBi2+zDgB1xQcSZN1VcscyH3w3MiUv/OB1KI HgkniYZ2Jb13ryTzMbfcYG+2FKCHPfT4mL+2g0KiDYYxeFwdiJNYHB8/l8ntoib4lCE8 7+v9un2iq0+q6V2b9cu8ohTOlerDdJNtjjzfXCnk5fSMHhBlRXwEz2kyWJHdzO1uxRPz aHWMHnXgXCmN48ch/zzmTC5paUBQHsz0f43ZR3MvB0uFQtDWqs+DhKXTM0NZ5KOuHPU6 GrtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jsHIQbIN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r4-20020a63ce44000000b0051b1fe0b7besi2437717pgi.580.2023.04.13.09.34.08; Thu, 13 Apr 2023 09:34:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jsHIQbIN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229924AbjDMQX4 (ORCPT + 99 others); Thu, 13 Apr 2023 12:23:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbjDMQXy (ORCPT ); Thu, 13 Apr 2023 12:23:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D0DC869E; Thu, 13 Apr 2023 09:23:54 -0700 (PDT) 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 9D60A60C92; Thu, 13 Apr 2023 16:23:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83C64C433D2; Thu, 13 Apr 2023 16:23:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681403033; bh=63ksHATfE+J5PG5GH23Gfmun9q/zhyYaJcyPhs9226A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jsHIQbINJ2+esLoKal0Ert4zH7CcoIm8NMcGSVLF6YHVqNi8dxIfnYOw+zs7GZeLN Bjst3jIqhjTiTJWJZP23X0Pne6Xq6sV5swycdVf/dMZ6nKNnS3ts0tF02iBBiENWP2 NUTZA/jOrwiUDnOFcR4Nz8ZYhCdngyEUYKGy3UIWTkNItNfWI0m/8pi7Sw3U+h3DnR ecGA4rcQ6EGY217jj/aalPFhWfuZ0cGwm+jH4mOf6XAPQq5+y5mFyNgNm1O/QmiqbG vLATOJE7wwXJ+p3FnnviwNFJa5lDyp5nPJSy4qa42JEz49JBxr8fgNEBozIDvPlo0Q 9pR6ZIDTFgcgQ== Date: Thu, 13 Apr 2023 17:23:48 +0100 From: Mark Brown To: Gao Xiang Cc: Gao Xiang , Christian Brauner , Jingbo Xu , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the erofs tree with the vfs-idmapping tree Message-ID: <664140af-3d95-416c-8f89-cad7beeaac19@sirena.org.uk> References: <20230413144651.3519980-1-broonie@kernel.org> <4f9fdec2-cc2a-4bc7-9ddc-87809395f493@sirena.org.uk> <699f01a7-8c0e-98d9-d2c7-eaf08552f543@linux.alibaba.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7zx0GPVmMMe9mQfB" Content-Disposition: inline In-Reply-To: <699f01a7-8c0e-98d9-d2c7-eaf08552f543@linux.alibaba.com> X-Cookie: Idleness is the holiday of fools. X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --7zx0GPVmMMe9mQfB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Apr 14, 2023 at 12:16:46AM +0800, Gao Xiang wrote: > Thanks. Actually I didn't update the corresponind xattr patches (just > rebase some older commits, also I'd like to avoid in the future, but > sometimes it's impossible at least if some RVB is added...) > I think it could be resolved as before by Stephen: > https://lore.kernel.org/r/20230412101942.75e3efa9@canb.auug.org.au > And which looks the same as below: Probably some context changed which caused me to have to reresolve the conflict? Or perhaps just rerere not syncing properly from Stephen's work. --7zx0GPVmMMe9mQfB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEyBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmQ4LJMACgkQJNaLcl1U h9DslwfzBamgEmLUmCZ4y5gdXu1QHH54PrmzE16k2M/L7HDRV5YTPbENhFsdL1sL DYho+9l1dHi+qm0LDIsf4VvIMy1DSvubfZwYIzT5JFSDYKDQbnEHsrPMurxQWZd2 f13uZmzjrnPUJx9MbGH74ZRHQvFlPNYDj9xI1ygK9+KNcZIcEfm45UYrLjq0jS9L ucpz59PGPeRIXR8X3Z72J2jizPzGEgLIyB8/Yy0L8o0Enzhx8fUBIPUGQZD0pJde PunTB2L+Fde3Z1VArmi2IvVjNG4/GS1FI1n5UFbHG0WphtX0KX//+aLGSf+9Y/JX /GIm1juZpYiPFdsbv3vHn/w7Fbp3 =2jsS -----END PGP SIGNATURE----- --7zx0GPVmMMe9mQfB--