From patchwork Mon Jul 15 00:58:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13732829 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 DBEAA4A18; Mon, 15 Jul 2024 00:58:40 +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=1721005123; cv=none; b=m4vzyaCsPYrxArma33y9hsSOU6HPFV3fcLaCDRhQmT10CPYo1FCwbTLulw7NE/e3lsMlq5gwxQbUhOCUGO6BGI1/NDflHdVIwuKk1HSHlZMl0u7JPiddFc2GY1WTIvbmNvvyaQP2g/JrirebCL2C0NmJpjnx1f28BXUmjnMiX+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721005123; c=relaxed/simple; bh=Bm+eXTVkAB7kqv/OKXbzXBjknfigS9qxCazq3JRqfCQ=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=dWwkoP8rRAUgSRsuULOUpYmXtcH5T+uwgFP94y88Ts/bNldMr+u73p9ZJszeRzUhXKgld/8yPjvf4BX+KSZm5+lxu1qgkJJP31h0Wzk2+64N0DLFh7mJraMeGRAMf5ooDXlDK9YKvYwwQALw0mjGaxy7s+abAnlZhSTcVBpLK2Y= 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=kmaqEs65; 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="kmaqEs65" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1721005118; bh=NGmOeTs8rbCRo+Lfmub4TgfphZcHrV4Vg4NavsxUQ7s=; h=Date:From:To:Cc:Subject:From; b=kmaqEs65BlZWsm01CEoDB0kvl+/aQVIG4iUP8JQL5X4SFgmEzoSbdbTlY3YFGery2 d3OTWqGy8E3aZFi4SkgTsNTXO4TNq9h4ST05aY2cRpR/oCkmK/W1G9Q5ebeHAPlzAB qpjVOC0sLloy2Dwaif0uCOdRUljPoq47+q4Yvxcb3OJv8GJ+Ld8+YWT2Jn0SlWLdyc FsZQyWB7mg6RNfJjhWtuIfx3tnBCCXp1s1sWYPgCSzF85v1YfBzTQQ/VvQy77qB4iQ azI0euXWIz+mtna8Flc3HxuuV7ZEtHw6GedbM24BZQxgfd/llDpUciAE+PsXEzoDmA PVQOcjbFqsjEg== 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 4WMkNF2z2kz4wcl; Mon, 15 Jul 2024 10:58:37 +1000 (AEST) Date: Mon, 15 Jul 2024 10:58:36 +1000 From: Stephen Rothwell To: Anna Schumaker , Trond Myklebust , Andrew Morton Cc: Christoph Hellwig , Kairui Song , NFS Mailing List , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the nfs-anna tree with the mm-stable tree Message-ID: <20240715105836.6d6e6e50@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 fs-next tree got conflicts in: fs/nfs/nfstrace.h fs/nfs/write.c between commit: 237d29075ca7 ("nfs: drop usage of folio_file_pos") from the mm-stable tree and commit: 64568b27b2d2 ("nfs: pass explicit offset/count to trace events") from the nfs-anna tree. I fixed it up (for the nfstrace.h file I just used the latter, and 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. Signed-off-by: Stephen Rothwell diff --cc fs/nfs/write.c index 3573cdc4b28f,680505d664f0..000000000000 --- a/fs/nfs/write.c