Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp421775rdg; Tue, 10 Oct 2023 14:38:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2yyFx9vJCzVWwZz5A21BTAkCmiJmdpuT8xt6S8vS0ICUSazauHqFyj8tSKqA0mxOp5c6B X-Received: by 2002:a17:903:41c4:b0:1c5:7d49:570e with SMTP id u4-20020a17090341c400b001c57d49570emr26919691ple.29.1696973895011; Tue, 10 Oct 2023 14:38:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696973894; cv=none; d=google.com; s=arc-20160816; b=udPNdSYJm+DrkNjzxgBRl+QNNnY+YnaRMWz1umKcmabSyIEhoZXzThMs3zjJm/vgpe oXpagkFblyDvr4ec7oRe+tfpNUcS6Wh3PvdyNyxZ6/l77tIpKhXuKPghlorU4K4E2lK/ PRHCNQivkm/R8OKpH8PmaOGjNLccxPMGNRG4AhSLl4v8UVXQn6i3vZXFZhUAFZNyQly3 i40V87+mKXC/hGGybf7ScWfU+biBcelyPuP8u6hirFVqcxJDqQRw3P+DPtqyEthHVoXw qaJBM3pogu5o6ERX8s0OQ7O8N/2HIjNsjlbMdmcSMjAm7TnwkeBYwhTadu+kFBQR1+R+ Z4Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :subject:cc:to:from:date:dkim-signature; bh=/CBepwp4t81AuUT2xgJn+DMM7RYvmtf3m+pCUeUgpMg=; fh=xXw+xyv6nNYguiirPBiEgnPWoU4KiV4tiXRV4SrBhmY=; b=maAGr+IHb0ywFTzyfEWZQQOt2SLpM0fjZ9V3Rx07CaHbtHyMyp7VPxS0JmMInbdVOl 4L6ZrNgOu4dFe0L0fNNId9dSvi0mFc/FHNEJo7JviEXJm1Y8bq463hp45z8z+FI2sG4/ 8IqDQt0PmsndfVFThixEDkeGixLQs4skwh9ifGfB1Qo42ScHk4Yr2XavYCs+mc8MjJ53 3dAEwMkqdFh2TSiDDpx8Mcigh6DGrgm1Fb9uXb9AulJxgw3IH86qGq0ja2DGLMW+gEf5 E6jLBbuwFYI2UqeGGYSQVX7fOXqh7h/IBkW0BUmO2UNaM6k9KWtQuPkytxLwP3UO5w55 2cEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Flmk1m3r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id d2-20020a170902654200b001c9af77fc54si2691385pln.649.2023.10.10.14.38.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 14:38:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Flmk1m3r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id C50D183B7A95; Tue, 10 Oct 2023 14:38:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344010AbjJJViD (ORCPT + 99 others); Tue, 10 Oct 2023 17:38:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229749AbjJJViB (ORCPT ); Tue, 10 Oct 2023 17:38:01 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A1C1B9; Tue, 10 Oct 2023 14:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1696973875; bh=/CBepwp4t81AuUT2xgJn+DMM7RYvmtf3m+pCUeUgpMg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Flmk1m3rokSqAh5C73jZgeJyK3K3NoVJzbnflquV+EHa0YPh6fuCXN0RQUwrMzfNL Tdp8yYuKYqqP9BggN1fswtk8xeDz/J9wKnmx56webqwBdDxYsveCD3OFFl5SZpCEwE WCaH3S4GGhsu2QhD2GD3RUd5m1XU5fx4SLNqm1DMKKigUujKFpQzkfngqJjmE77maf 3ICNF9/Cbi+28eagBtiCLQ+sc+0tm5668FtRgv5po5BqRylTHhMG8db4RdAZtrsXqz wrpjrx/tdHnGDTGYtlc8S6gExx1z4xWBcLIuqQdACABKRo5x46VqRwhwU4zQBkoDrS LOaZihPHatokw== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S4q4z04LCz4xRj; Wed, 11 Oct 2023 08:37:54 +1100 (AEDT) Date: Wed, 11 Oct 2023 08:37:54 +1100 From: Stephen Rothwell To: Christian Brauner Cc: David Sterba , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the vfs-brauner tree with the btrfs tree Message-ID: <20231011083754.45a9ed53@canb.auug.org.au> In-Reply-To: <20231009-bauch-gedanken-e02e35804e03@brauner> References: <20231009104840.1bdadc80@canb.auug.org.au> <20231009-bauch-gedanken-e02e35804e03@brauner> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/5Yc6w3gTZ88fQAT6iwutLYj"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 10 Oct 2023 14:38:11 -0700 (PDT) X-Spam-Level: ** --Sig_/5Yc6w3gTZ88fQAT6iwutLYj Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Christian, On Mon, 9 Oct 2023 18:15:53 +0200 Christian Brauner wr= ote: > > > I have dropped the vfs-brauner tree for today as there is no way I can > > sort them out in a reasonable time. Please sort this out between > > yourselves. =20 >=20 > I'll fix that up! The btrfs tree (git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next) has moved again. I don't know (yet) if this will cause conflicts again, but there is a good chance that it will. --=20 Cheers, Stephen Rothwell --Sig_/5Yc6w3gTZ88fQAT6iwutLYj Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUlxDIACgkQAVBC80lX 0Gwa7Qf/T2JoRWEiSI1qXgUAK00erCGIRTxta2N3UtCM4ZrgoPk9SkE0uV7zXy8L GMjxSDXH/P0D3oV9TaXiNUyKSeWIipcAdubuNJpzth4iVJ16HKi6M+XPg2CJmpZI Nparc/VmvOKARcnSajeMFKbpjrj7lpjE6d7wemQfEorDZTCUcCSQ9Yv3F9OMbrKc qDgtrHJFZiWCvR8crQqyEPWJ5T4j4lf1k2NQdhvhQrZ8Nh/EvZ8lryMMXMZ2e33r vHobOdNjm+t06RJQSijplffe7FEUbe2CLcZsWMDnGc37VfmHh4gL0h21hA1m76Jc nhD4zQHfdPW0IZO3A/0FdGFl7IL4lA== =rsA6 -----END PGP SIGNATURE----- --Sig_/5Yc6w3gTZ88fQAT6iwutLYj--