Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp597259pxu; Thu, 15 Oct 2020 11:29:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXtS486ylgKmHGzJbtg1qxCqAu7aVvMDqnWB/ZMoo8c2awNVkmUhYPf4A5c40CICBwovBt X-Received: by 2002:a05:6402:31bc:: with SMTP id dj28mr5917027edb.10.1602786598248; Thu, 15 Oct 2020 11:29:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602786598; cv=none; d=google.com; s=arc-20160816; b=VnGU/kEvyCO4kqL0grJfIESl4Y79/lnAcd0QtzND21MrUfBRqpZcF+NL+dMadIxTO0 f+HmfISpfmVoQfpFiCD6OvR5N5/dm0xrjHZHjt4398YucPs3EG2aIRJ/9drknIVP5amP 6x7vSp5QmHJdcN4TIKaGqlqIVKNJLIj8qK8RkRp+A6BAfVp5/uVTg1lltp/87OAbiXPe lJ+peTDHTyOkC1hwEly8XASxGMmh8HL94SG3AAvFPUsC3ByPNrnZ9w6SpuU2v7EQIApB wfL7S181vidntZgnUkLH6QlsXkLBIdSrKu5HsZuXc0i0Dneq8zSf/2OTdQt96p3VWHWI QAjw== 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:mail-followup-to:reply-to:message-id :subject:cc:to:from:date; bh=v5ZrZGVjxAE02FnYcS7l3l0KqsuZJcyZhAQvj1v59Kc=; b=fdwfHX+HXjOFEGggVGYnHGT60Qe+H4WxG/0s0L+jayuFBdxQivMxUIXavYZTuEuANf gVBEESnSIBKDBJWBJEnnOJTpeXheqXd3HZaW9Y/L+bDQa8TESDUHYHhk7OQ8si8LlwLC 7sRYQzKi9GCWSnLyMX6QQwry4+dlnybEHQ7zXEi77zVADp5nqE1aYNYWnSY/1PxYD5VL swz6ZUiaLiFcfoTmr39jqUJ1a4RIYcbNOK/1jMaCAH5cPqWhFFWZvHFG4D2loRyjNRR4 1yVLMby4xyUmcHQX4MWvXzEO3Ig8j2XPVBeI/elK1V3dJ/L75ykzTWaZqpwkIMRfNNY7 Oniw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r18si2596337edy.411.2020.10.15.11.29.27; Thu, 15 Oct 2020 11:29:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388705AbgJOOnn (ORCPT + 99 others); Thu, 15 Oct 2020 10:43:43 -0400 Received: from mx2.suse.de ([195.135.220.15]:51082 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730674AbgJOOnn (ORCPT ); Thu, 15 Oct 2020 10:43:43 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 45F8BAC24; Thu, 15 Oct 2020 14:43:41 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id A7717DA7C3; Thu, 15 Oct 2020 16:42:13 +0200 (CEST) Date: Thu, 15 Oct 2020 16:42:13 +0200 From: David Sterba To: Stephen Rothwell Cc: David Sterba , Linux Kernel Mailing List , Linux Next Mailing List , Linus Torvalds Subject: Re: linux-next: manual merge of the btrfs tree with Linus' tree Message-ID: <20201015144213.GP6756@twin.jikos.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Stephen Rothwell , Linux Kernel Mailing List , Linux Next Mailing List , Linus Torvalds References: <20201015113530.115e0361@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201015113530.115e0361@canb.auug.org.au> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 15, 2020 at 11:35:30AM +1100, Stephen Rothwell wrote: > Hi all, > > Please do *not* rebase/rewrite your linux-next included tree and then > immediately send it to Linus. Or if you do, the please also update > what you have in linux-next (so you can sneak it past me :-(). > (mutter, mutter, unnecessary conflicts :-(). > > I have dropped the brtfs tree from linux-next today. I've pushed updated for-next and next-fixes to k.org, sorry for inconvenience.