Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp60786rdb; Thu, 21 Dec 2023 02:51:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHVKoaFulEhSTrDXBn3dzqXSl1fDrnAwPUN9o8zaOMNX2ydQFTA6jwMFv3Jp2+oPmANDaGP X-Received: by 2002:ac8:5c01:0:b0:425:4043:41c9 with SMTP id i1-20020ac85c01000000b00425404341c9mr29356229qti.117.1703155873516; Thu, 21 Dec 2023 02:51:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703155873; cv=none; d=google.com; s=arc-20160816; b=n7IrKd4qQA55/8xogJBCWQK1KbfJ70SzOKIcOayGLB+pqYkAT79iCj0g0taiaeAKWY NKn9HAk8+jbbt5jK66jTcaEIf2Y0IHlyKxw4NMQnc9HF0RaZFrBmUzNrsfMjzceul3mK DxbL0c0CfZGMLFHpIzvEVLo2dCd6cNtPYYmT47w/z2ibkTP8YPLemdH1MlNZ46EDtzlT XG95EyFFNFvAmJgK/0ZFFgUj2gd5R0PIl86f6CLg3sW+/6+sAVQYdbc4CYFfEuGaEc55 FZyQ34gttcfOsodgMtnFoddRbTFEwOjiLD/FwcScwpZixGV2YH3ssp7rHQ8WNQ31dJgp Q4VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:content-id:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:subject:cc:to:references :in-reply-to:from:organization:dkim-signature; bh=TV++FB5pPdD4o2Vgx5Or1C/+V8n11WxfDyriDQArJ0o=; fh=mrlUwRz2jXvNBw1T0yslxvRkzFS9b1G/ANqV7gc/Kko=; b=L8qEoLGp44c9vTTPJ6nVKL6CU4SZk3ouF6Db3w3cPnp9t2srB9J+kED9k2+mrIyerW mkXmNSCYxQt2xtF0QNivj2BDpsq7VMsMV22qThBh4K2kXNihglq6xTWCMa0ZML0ir65t oGd7AY81Aek/3nyeU7yv8Dh58/eO1H+mkxGbq5oyRy+r5Y7znnbtyHAZ+HPjRMzDMoiW Zo3C+7kxONgOS3V7AbpNopKIbhbcVeOdlnqlEK39crPUP5Ck/NrO9w5nD2UqbS8SgCn7 bhJ64swHNIK1yqWdJUnAX2PprH2QNF9NrCFfQJEniH4KQidCmlyHic4rYRsSZU3/fTdw u0Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KJO02uCw; spf=pass (google.com: domain of linux-kernel+bounces-8245-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8245-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id d1-20020a05622a100100b00425a8441e7csi1838768qte.431.2023.12.21.02.51.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 02:51:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8245-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KJO02uCw; spf=pass (google.com: domain of linux-kernel+bounces-8245-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8245-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 40D571C2449B for ; Thu, 21 Dec 2023 10:51:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 28B716BB3D; Thu, 21 Dec 2023 10:50:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KJO02uCw" X-Original-To: linux-kernel@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B932B6BB24 for ; Thu, 21 Dec 2023 10:50:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703155854; h=from:from:reply-to:subject:subject: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=TV++FB5pPdD4o2Vgx5Or1C/+V8n11WxfDyriDQArJ0o=; b=KJO02uCwjgdLaW6h5ojE/tqUFF8PRrJEofUE3b/VMBBHyLwSbvDHmbnHN+C+cvOhn8CL+3 Oy2kG3CbB6/YqQCW/O+x3iWNjhVpq6HiUKBY7t95li4QnwgGdrc2Ly6dNjE4wX/X/+Hk4X XgFqtQryhZu/3BMgAndXIyrKZqLOeD8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-28-rAr2947VMkaEEFYzqi51nw-1; Thu, 21 Dec 2023 05:50:50 -0500 X-MC-Unique: rAr2947VMkaEEFYzqi51nw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 99929830FD7; Thu, 21 Dec 2023 10:50:49 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.39.195.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id C640B492BE6; Thu, 21 Dec 2023 10:50:48 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <20231221110016.21168260@canb.auug.org.au> References: <20231221110016.21168260@canb.auug.org.au> To: Stephen Rothwell Cc: dhowells@redhat.com, Christian Brauner , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patches in the vfs-brauner tree Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <1583608.1703155848.1@warthog.procyon.org.uk> Date: Thu, 21 Dec 2023 10:50:48 +0000 Message-ID: <1583609.1703155848@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 Stephen Rothwell wrote: > It looks like the afs tree has been rebased since (part of) it was merged > into the vfs-brauner tree. :-( What's the best way to deal with this? Push these two patches down to the bottom of the branches and then base both trees off those two same commits? David