Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp681466rdg; Wed, 11 Oct 2023 02:27:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGDcLy2VipsUXEP5NYqM4aseMOLbQdXcduvjA/DjUUGluIgwMW2Oaa1y05630xJxmR3nxyS X-Received: by 2002:a17:90b:1d05:b0:269:524f:2a19 with SMTP id on5-20020a17090b1d0500b00269524f2a19mr20108291pjb.26.1697016453495; Wed, 11 Oct 2023 02:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697016453; cv=none; d=google.com; s=arc-20160816; b=B+9XSUGcnFpW1I0A99G014RadAlWIKRIdTCLwp3iftNJT3QFiz4YZzoElo4MczK8pB H39FOR1+mVfMq4n5DtTGf7xaiGi+sbbL5mqGPXuE0pCSWnuhv/nIZDSwaslx8g7RGLPn 7mAPr91jU01PJhSmzk40g46TGKSCsPiqQ8o3/x95TFq2vxEEFS9wHSbRPlYb8vomB2+A 48I9xHah5S/MATr38PQ9X+PN4sdodZPLAtPiL/GM/gSiF6FTbBz1dkcqpSoPnqnttRd/ KKqlUIdnGnSA6dF2TG+W9G0EkoMI6RBesmPYe+Ey86ejjgyrCVVp+xM7DrokCsjvaAbq 2v8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:reply-to:message-id:subject:cc:to:from:date :dkim-signature:dkim-signature; bh=C/EBe5ZBlc1UdzTBDkR0kZny3LfCJ1gv2QaEQ5cP4Aw=; fh=zOfFHMnC1cAb+wr+xnw++rs/qqs1f8fV8PoLqzhuxlM=; b=guq8i5o7RDVyJT4y+CmPnraquGwmgfFnIRZ7l4a4x5qyEkThTO0IpziMF0yp1lyAc6 xu2opkdDMB/+xdBqveBkhn1kAsMlf+oVD2Rs4v7ZoqsQqP5zfwvbvvbbtc2XYnS5gRzb 6u2jK7A1fGBLPekX1MGvW6k0/S3UE9vLgLS7YiMrgasJfoXJSmTqdUw9AnO1wx1tQ0Zj gwM+M+NSTQGp/GKjy3hgLc5w/AZowv/QrdtmuCXuLAIVhZNw7rEHoamdqW0RIT2E2Rs3 bkVODkt7VwtAz4eMQqfLyJyQ0cNvLbX3Yukxfzz8XXSst1WNYCSTkunHC3wFoiDw1vi/ q38A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=FQ63SgUD; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id o1-20020a17090ad24100b00262e99964bdsi111558pjw.99.2023.10.11.02.27.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 02:27:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=FQ63SgUD; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id B3AA88089E57; Wed, 11 Oct 2023 02:27:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234412AbjJKJ1F (ORCPT + 99 others); Wed, 11 Oct 2023 05:27:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345676AbjJKJ0x (ORCPT ); Wed, 11 Oct 2023 05:26:53 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDB3A9D; Wed, 11 Oct 2023 02:26:51 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 7802A21847; Wed, 11 Oct 2023 09:26:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1697016410; h=from:from:reply-to:reply-to:date:date:message-id:message-id:to:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=C/EBe5ZBlc1UdzTBDkR0kZny3LfCJ1gv2QaEQ5cP4Aw=; b=FQ63SgUDnaAzC38d7plQBWOaiF9HqTgWJODPIBu/yLTLsYZbMyINt8sIHx10rtfQMRZ683 ZVVgRlpzKDsaem1BjpKLyAK/wf3er9xPYWfp7qj2pZ04DwGYAeXg1GfDELOUxBn87K3MTd 7MiomytD9Up9a0YBj2omi0xB5ub1OVM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1697016410; h=from:from:reply-to:reply-to:date:date:message-id:message-id:to:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=C/EBe5ZBlc1UdzTBDkR0kZny3LfCJ1gv2QaEQ5cP4Aw=; b=7K6e8JrotMQJiKx0rlXxl35F8w5WVDZk2BkfOQ7g7N/97vnFgoiSoBwKIZr3c3e/NJFHxZ UJs847r7DNcBAjCQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 4D38F134F5; Wed, 11 Oct 2023 09:26:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 7SIXElpqJmW0QAAAMHmgww (envelope-from ); Wed, 11 Oct 2023 09:26:50 +0000 Date: Wed, 11 Oct 2023 11:20:04 +0200 From: David Sterba To: Stephen Rothwell Cc: Christian Brauner , 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: <20231011092004.GE2211@suse.cz> Reply-To: dsterba@suse.cz References: <20231009104840.1bdadc80@canb.auug.org.au> <20231009-bauch-gedanken-e02e35804e03@brauner> <20231011083754.45a9ed53@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231011083754.45a9ed53@canb.auug.org.au> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) 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 groat.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 (groat.vger.email [0.0.0.0]); Wed, 11 Oct 2023 02:27:29 -0700 (PDT) X-Spam-Level: ** On Wed, Oct 11, 2023 at 08:37:54AM +1100, Stephen Rothwell wrote: > Hi Christian, > > On Mon, 9 Oct 2023 18:15:53 +0200 Christian Brauner wrote: > > > > > 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. > > > > 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. I'm updating the for-next snapshost a few times a week but as this would cause too much work for the VFS merges I'll do one more push but remove anything that is not finalized for 6.7 merge window. This should provide a stable base. I may need to push some fixes but this could be done via the next-fixes branch so that it would not interfere with auto-merging of the regular for-next.