From patchwork Wed Jan 8 21:45:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13931570 Received: from mail.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 AF8A02040B9; Wed, 8 Jan 2025 21:45:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736372713; cv=none; b=NauYpNPt/8NAZsIgkeykN3b9+V9vSO5Z+W9405x1R4ZhVc+6ibnSXf67jC9CHu35MqJKDKV3QZpGee3tu2JJe/RzuquLd1zgpYu74PGVKuLTIfWt+E6GaSdpESfYC9ICh/Q37YXngTCVqQ5nIZmm1lL95LYWXpv43DICgKxmw7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736372713; c=relaxed/simple; bh=X0aAD+o4Opsr95XHrthvpsnLVv6sXFdpfvO1nU4p1Wk=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=SrXJCTZQ4dUQ7Ma/uSwdIg3mYNLqs6C9jpxpbJk+SnOFpji7+rLN5NSUGTNBLcIBfImf32FHxgmMq/E3DnztoJqMgos9YIwwltX96kDqLxGitqo6DPMQplrAkas7JUwTa3MC78DDwFZ2RTeKIF2c+eZJUPAYPdFkcb5Pms1eMq0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=W85768rN; arc=none smtp.client-ip=150.107.74.76 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 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="W85768rN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1736372697; bh=5y5fC8vBsfLkwmxzYmaRRRrfDFBy7Wm7ZUP1hlHJ7ww=; h=Date:From:To:Cc:Subject:From; b=W85768rN3aphxMKKtm2ieL4jVLE3PuomIEWwdKJNYrr7oQCZVRfBB7j1wn3WyNVoC DF+DdWp0CKPDhyvJ+Cfy1FCbPdX/4IIzOKLVm/02LcG8xlxlshifxxtgBB/+KmLxTF hOzT7K6Ewq5Oi6na3RW7chIPCapj+23PNIXdIsRIQUYjdkMY/m3kRvsLcEFtvPV8y1 ZEgAJ9J7xLtx3h3bh8AVLQmtPQwBPcmYD3MUj6nVlfiJ24fP/+/j1T3RmjqNZj3Kyy nNhZhPJyMKmTByh7Qibcah4ZmNWXikasYeaqeiBCIcA3fimfy+1vKKyzOu3Ayh1EML GfC6MTfrEiX3w== 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) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4YT1fd2P1Qz4wc4; Thu, 9 Jan 2025 08:44:57 +1100 (AEDT) Date: Thu, 9 Jan 2025 08:45:03 +1100 From: Stephen Rothwell To: Christian Brauner , Anna Schumaker , Trond Myklebust Cc: NFS Mailing List , Anna Schumaker , Linux Kernel Mailing List , Linux Next Mailing List , Mike Snitzer Subject: linux-next: manual merge of the vfs-brauner tree with the nfs-anna tree Message-ID: <20250109084503.1e046ef7@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/nfsd/filecache.c between commit: 735aab1241ea ("nfsd: nfsd_file_acquire_local no longer returns GC'd nfsd_file") from the nfs-anna tree and commits: f905e00904cc ("tree-wide: s/revert_creds()/put_cred(revert_creds_light())/g") 51c0bcf0973a ("tree-wide: s/revert_creds_light()/revert_creds()/g") from the vfs-brauner 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/nfsd/filecache.c index 2adf95e2b379,dc5c9d8e8202..000000000000 --- a/fs/nfsd/filecache.c