From patchwork Mon Feb 26 23:28:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 206972 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2389608dyb; Mon, 26 Feb 2024 15:28:49 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWoP30llIReWNLyHUY4ClF0HRjJPGMPEQLpZ4TtVbETbRjTeezMqlQLRoDJtTpaGRd1Hj+68EwpvmIdqNtKML6TghCSzA== X-Google-Smtp-Source: AGHT+IG32XtWjxOcstoWG0APqmkaUWFhdFn7xOjbHzt9tvbGjTPOppq4p9hhtqU1sEaE0T6Dw4lR X-Received: by 2002:a17:902:ea0e:b0:1dc:30ab:406b with SMTP id s14-20020a170902ea0e00b001dc30ab406bmr9691804plg.13.1708990129114; Mon, 26 Feb 2024 15:28:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708990129; cv=pass; d=google.com; s=arc-20160816; b=jY8j5qP4x7Y08YsIBMPvCwgI/pHVIC3IkUtiLUidCTZWDi6q51hiJqVRZkONzayGTc L5eFSYXznyKQSVBFuEM9OBI9fy5yYj6/V4/EV25a6+juHv5nhjq2B3cBbjOfKUBaw2nT XPh8Kr5VI01TjFk0CFQbMg2qCRe7JUCrvQs046m7DXNBDrt/SA3kSIp+/A/uUh9ZhfWU 8XDIlgdkz8QO7Jqe9AMpQmDzHxi2zz7+O/vZe8fhZz2dCj0lxrFOK2E2S9+vYt+iM7sJ 4/f+BT9UY/VTCqtCECQXjFJmWJaOHlcpBcCEvDRphDu/Z6guQhCyCBy+XyESeitU/q1u 22zQ== ARC-Message-Signature: i=2; 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=7/s82SZsxC7vPzBKKfBkGYTuP9xvJQUaq4CPgmdV56c=; fh=5AEE19kimhJfFrrulQDpP8WH3a52JWnC3i4cK3Sq724=; b=SNcvNhdo+HQfvcqD8sJ9eD/8D6r5Ob1+GIw5mJpLf9CyUDOMxXecsc6ZVd8vp5ClRK ALUqnA0WVUGpML4KjTDtp97iwsQgm0XVEIp/+6SI97ToR6NldPOIpSFpkHD6zAp0UNT7 WFPr4Kl3z+XK6pU6gMsm0Bw029zRRAo/+06uv31bkHC5Kslhl8sVLZ3FbcqCfR2omEcC F00MIs6EX1+QJoXqtvnUkUVe0QJF65KJgBoCFkiiAHLM4zPBW1AzXG1wJ5UJeK0zahfk zLmRbqzq2N27DOK2dOF9LutarQpUc98+bqZBV9n7qDswhZhv5Fz+X9FKzQaJ4dS/6owR ExUg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=MCwtZwGa; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-82440-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82440-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 b3-20020a170902e94300b001d4ca2fcc4asi332807pll.291.2024.02.26.15.28.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 15:28:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82440-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=MCwtZwGa; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-82440-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82440-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 EA47F286E19 for ; Mon, 26 Feb 2024 23:28:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5048D13541E; Mon, 26 Feb 2024 23:28:37 +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="MCwtZwGa" 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 65B5A13541B; Mon, 26 Feb 2024 23:28:30 +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=1708990114; cv=none; b=EtMAEFNYkGfe+0Pn3jy6v0N2Z0MUNll96TlU2A8LWZynDuypozqfqp/VtbXg4n1rF287fKAE66eUfTBtVj7iK3Jn5efC+xvTYexhUqmGW6epQdZxox56YTStjLAPrYuMPwtscVSkg9RQqNHkkpMYq8cGGw1pzk6RFGtvOnqeCcU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708990114; c=relaxed/simple; bh=vpnQdb+6rc5A4iBkipWUZqFQkOPYet+kLGEWv6NTJ4U=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=S3DO/VXeg4UGS0+HJzbvHcwErRgTVRHW4IV1/RjqAndrc4WKSgUWK00nOOrQ3ko5nTqvpWoqg3HKjnKwVb4gmjxgL3cTvYguob2PGaGopA0plg9IfniZeD9yrS/EaR/jYoYC4fXP/Sn5CdMK2oRim/S6EQ9MlNP1qIXYPotbjWg= 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=MCwtZwGa; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1708990108; bh=7/s82SZsxC7vPzBKKfBkGYTuP9xvJQUaq4CPgmdV56c=; h=Date:From:To:Cc:Subject:From; b=MCwtZwGaX48rjnIvqpbI546NJeYqWMA2DuG4VFwG7vtceyrx7N8O97G9b0gf6CQmz r6JMkAFBT32KjrOAs7DYkOZg3GCK3ABN9WEhSbq7lRCFeb/EoWC0sJB414J/2tRLqj 8mVVi7sEOsjfTaGk/NPg9MV+VsUjp5lH8LKS+LqR/MI9Ug23URenlrtymskpJOHzOO gmR1cgcIGxXWhjuAAXBRt7ZSIhG8tzkIWr7V+Lza6PGIt26ZXQE9/N0k6gMakNIIiz 5DXodFRRBloosIbnfWx7aprGeiVqh2j4boyU2et+fS1lYhOY5Y/55Ss/0BYOjvfjen jK4LIYHkGViOQ== 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 4TkGyM6Tslz4wc1; Tue, 27 Feb 2024 10:28:27 +1100 (AEDT) Date: Tue, 27 Feb 2024 10:28:27 +1100 From: Stephen Rothwell To: Christian Brauner , "Darrick J. Wong" , David Chinner Cc: , Chandan Babu R , Dave Chinner , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the vfs-brauner tree with the xfs tree Message-ID: <20240227102827.313113cd@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: 1792006033633935722 X-GMAIL-MSGID: 1792006033633935722 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/xfs/xfs_buf.c between commits: d4c75a1b40cd ("xfs: convert remaining kmem_free() to kfree()") 5076a6040ca1 ("xfs: support in-memory buffer cache targets") from the xfs tree and commit: 1b9e2d90141c ("xfs: port block device access to files") 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/xfs/xfs_buf.c index 7fc26e64368d,01b41fabbe3c..000000000000 --- a/fs/xfs/xfs_buf.c