From patchwork Fri Jan 5 00:10:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 185174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5942511dyb; Thu, 4 Jan 2024 16:16:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IEgbt7JnzU815y624JhfyALRC9r/Q6DkBcc8D912EWxOAQU3B64WfYnl9mpDrNxXCY1cDEh X-Received: by 2002:a17:907:6d06:b0:a26:ea1f:92e5 with SMTP id sa6-20020a1709076d0600b00a26ea1f92e5mr816790ejc.38.1704413763521; Thu, 04 Jan 2024 16:16:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704413763; cv=none; d=google.com; s=arc-20160816; b=fMjeWdqWBCtc+Uqo2R6RKZyFitWDO1/8nGepqp0S8hKxVrBb0LQgwkFo0LlPs+6IeQ YzwG+fo/vKLwrbqSJbR/D6DuecQ2LLal66330H1ZfcmGuIIDpy+3DIUtIJQFGIvJNqSr nyqGQwju6wGoMKDjn/TabgL1oAQgceTgPDdmcb/UvapDmg1hTS2JvSMpG0ICPooYce33 LfGyQA6y+M4ll0UlklNjvWIiI9hKk1YpfoBuZ3bB3JFWZQo+OARQdrNKCXiszrVH2Zao 9HrjSk5NfYWZHlLUozEF60CrgB7x8pvebuT6Xy2jcy07o1jkpQauNAIH14549DERsJq8 Hw0A== 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=gq6qCo8Z9i5nzsJTvOM5IqitMFtRngmF8UYkyG6IgLI=; fh=CTNbqjjTf++MClya1oQBj7I35ZCaGzKfIHi54oS2V2s=; b=WzW7LC9W3ezJOfdL/Cv6xpiiIrUqdUA3/o+EL0T/nmUXLY0aELyE3ZVtyuO+vUPgWc DuwoZjITp6Qm+pX3s96A6Z5f4qR3zuvFsHdijr48J8IlgpSPgHQbvq9qqWRtFr5QREwK NsIEcHZ6P9WKUZEWaIXH3vBQE6Q79vgbka4mk8x3SUirXFWtF/mMsEe9rHxtcgaIgvF0 pfZh0sJDfthMSTSPKp4Tl/lgZQYsckI2zQt9oT64SMsCLzADOZn9KqPMUEKN0ii+qsCX A9wef6jW3yco+Rn2w6LAymk6VHUkevrzhQeWEbLgMpUT5o4S0jie8QwPxtr/S4m3D4bg v51g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="qZZv/VnU"; spf=pass (google.com: domain of linux-kernel+bounces-17350-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17350-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id v1-20020a170906564100b00a26f3d5af61si32520ejr.846.2024.01.04.16.16.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 16:16:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17350-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="qZZv/VnU"; spf=pass (google.com: domain of linux-kernel+bounces-17350-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17350-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 4AB221F2592A for ; Fri, 5 Jan 2024 00:10:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 449131FCA; Fri, 5 Jan 2024 00:10:25 +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="qZZv/VnU" 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 DCB2EA35; Fri, 5 Jan 2024 00:10:19 +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=1704413418; bh=gq6qCo8Z9i5nzsJTvOM5IqitMFtRngmF8UYkyG6IgLI=; h=Date:From:To:Cc:Subject:From; b=qZZv/VnUGgF27DKkt8zKc47S1xoU+VSaEhy10ezAbEBXIiqcrme/M6fEvefqcqvnB CU8xT9wlEADFaDV2M1wy8c1DWsvk7WcWi+B8cX7U1zOyoBz+wDoQ8naPKxLFZ6JRqA iofjlSONBn3/bcdbaNxOaDhzx8L2zB/hXdflAQHO9B2rWuPi0IyIgiONp0GFFel1tA T5T/jZ119zprh6eI61G+/l9btLhjsqndjHk1oPm98YNqSf3QE0Cbyj3YezjM3D0V/9 Yc0mbxUHyZu1kCATIPSPCFhftBwWJ/m33o693LEdSrm/Y8MzM6o2OsuMrnCIpPTDla uS1nQVNAUlBIg== 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 4T5kP540tgz4x1x; Fri, 5 Jan 2024 11:10:16 +1100 (AEDT) Date: Fri, 5 Jan 2024 11:10:16 +1100 From: Stephen Rothwell To: Al Viro Cc: Linux Kernel Mailing List , Linux Next Mailing List , "Steven Rostedt (Google)" Subject: linux-next: manual merge of the vfs tree with Linus' tree Message-ID: <20240105111016.5a3c36d0@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: 1787207366468667941 X-GMAIL-MSGID: 1787207366468667941 Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/tracefs/inode.c between commits: 7e8358edf503 ("eventfs: Fix file and directory uid and gid ownership") ad579864637a ("tracefs: Check for dentry->d_inode exists in set_gid()") from Linus' tree and commit: da549bdd15c2 ("dentry: switch the lists of children to hlist") 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/tracefs/inode.c index bc86ffdb103b,61ca5fcf10f9..000000000000 --- a/fs/tracefs/inode.c