From patchwork Tue Dec 19 23:56:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 181346 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2310643dyi; Tue, 19 Dec 2023 15:56:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IEF3skVrU38+Z+T0j8MOyQmL+5q/vz3zJtAbDxRUO/xah2ZWeItlYXFBxXFrq7c0UtZGb0F X-Received: by 2002:a05:6808:1294:b0:3b8:b063:5058 with SMTP id a20-20020a056808129400b003b8b0635058mr20960607oiw.89.1703030188610; Tue, 19 Dec 2023 15:56:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703030188; cv=none; d=google.com; s=arc-20160816; b=0cMR3PAJ0Uu8EIj77N8zmvdmkzWWNUt6CoBAMLNcV4ocue0brovVEq3yRuveTnfHmp rm9Lkt4NIYEeNmz1WF+8tRSQJCWiGip5NmiauDS09ZVrwCmycuAZazBxYuUoC4Ez6LMx zDtVlfSJtT3k9vlQMJ/wfp59C6ZTSPw4W2yBsvcxN1kdLB0Upakb4+5GqsuX65ftm3bZ NHB+LFoVyz1tmy7cj94EL5KUdYJfWBSS6JlqAWHXQ8l8TIsYt48H+ONX7A+Ae9iX98H/ IRvga/yt9rsiJUykp9MiMKvwGImqQ3D+MPmDTYsBUuoJWGw7EeFD2DGUZqCaxqBFi5RM psyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=NLVVHDWoo4m9iV9XvG532dnuIVRB29z5UhevReT02ss=; fh=wKBDzzqzi3MZmWEHbVf4kSSn0v67tAoEN0bQceAk/EE=; b=kx4jx0/oPBWPMYDG5hS9rYS5oSHMFSq5lpjphp5MxpmvBEHwkXfCi8VHJa/rNOqJvc xGX3mLyNLJwekcKGQf5RiFcW653L7xTVNAT/MI1sOl5WPN3ypWiXldTkIHvX1B4pK/g9 x4/V+sfBcfZOTRcjjYV4+a9IRX9qKE2KM+SQMtNw+ws1BmeWIwBy6senwDHRbr5GJYWR fHPZiOzbQRRtdKmbmmUvdq/gvctCDj/mxHWQVshcPyTHZTqbWOR1dxrj71YNpv0BNX8e emfyYMCFzagupdLa9OxFgKoeh0oiR5+3ybvCxiOVwuXAzDiaPb4NBjXIMHRzF3mitoxV i/vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="GOFGxc/E"; spf=pass (google.com: domain of linux-kernel+bounces-6119-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-6119-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id t35-20020a056a0013a300b006d8ba635b86si3144433pfg.170.2023.12.19.15.56.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 15:56:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-6119-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="GOFGxc/E"; spf=pass (google.com: domain of linux-kernel+bounces-6119-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-6119-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 6011E285496 for ; Tue, 19 Dec 2023 23:56:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0614540C04; Tue, 19 Dec 2023 23:56:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="GOFGxc/E" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 DA03F40BE3; Tue, 19 Dec 2023 23:56:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1703030168; bh=NLVVHDWoo4m9iV9XvG532dnuIVRB29z5UhevReT02ss=; h=Date:From:To:Cc:Subject:From; b=GOFGxc/EXg4t8Q81hlp7wTBJEzma4pTGro4f+Ku01X+fHL19gw6Wpe8ElOYWhSQL7 8kWez2H7MtSv3unqU1vGc7xZbsx4r6cAQJRY2eCUjUEAsslqChDSXJSFo3qIEA/6cc Uyak7e09rnA/RuOleRw0VacSqoGSITzmByv9YbH/OWxLkHZtLckBjHU+gWU+7qfi/1 GDAh78GAZvG3TpDIlbsQPG8sndNsVLfoGQSDD2Xuyz2m0es/eImTdNvi/sNF+9RU0y grEdvV5QDDA0RRACyPximZtPItWkeGzsuLfJHSbYLlQ3D1XktDULHo1tlOgaTsogwq myp8nwp313cOw== 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 4Svtr65D82z4wdB; Wed, 20 Dec 2023 10:56:06 +1100 (AEDT) Date: Wed, 20 Dec 2023 10:56:05 +1100 From: Stephen Rothwell To: Al Viro , Miklos Szeredi , Amir Goldstein Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the vfs tree with the overlayfs-fixes tree Message-ID: <20231220105605.6f288fb6@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785756583393549990 X-GMAIL-MSGID: 1785756583393549990 Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/overlayfs/copy_up.c between commit: 413ba91089c7 ("ovl: fix dentry reference leak after changes to underlying layers") from the overlayfs-fixes tree and commit: a8b0026847b8 ("rename(): avoid a deadlock in the case of parents having no common ancestor") from the vfs tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc fs/overlayfs/copy_up.c index 696478f09cc1,e44dc5f66161..000000000000 --- a/fs/overlayfs/copy_up.c