From patchwork Wed Jan 10 23:03:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 187101 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp1104544dyi; Wed, 10 Jan 2024 15:04:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFd4N1Jv5cUBH5/UTtITuLzxGtiifx8YyMSHUN7Tr4DkEAzIU6XYREPjgF8m1yFBnfGXNE+ X-Received: by 2002:a05:620a:4d1:b0:783:355f:bee7 with SMTP id 17-20020a05620a04d100b00783355fbee7mr361011qks.21.1704927844795; Wed, 10 Jan 2024 15:04:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704927844; cv=none; d=google.com; s=arc-20160816; b=Y8hQECBOkqM5+raZqPGTxhsBK7auftiOeYu5tpWeIFhLipGfFHsg1jcpIKLVZFfAwM kORKFhchBQ5TpLe4p2MSFjyEndJ05gQAkAwkxXZgnQMmWBkQxt9A/BuZAwSwnL1SXSrV 18gmjLNnZ+pvKlm9PADPh24Fleuy//qcEGWRYmGSIV0h3Xm/uAkBbtDXHP0gsKgwtAuo VESCBLGONYG21CTo20b+yYt9PyEcb0ZsREdhO5JxjzQG9UXdhN9eI+wJoQzIWXLL3b0L U8BoeOMbAcwqtYS1fol8G/UjfS6BFIah5YsM3csfvzcZ/JBCnBxnxXwBaDEdYUdT6vBw 5gtA== 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=t6qTg4+hvafGldknVqf3jODmxC5jGlYpKg7EK7DM02M=; fh=wp8LUujDEE6TiYmNQcE4YXi7thnsq6kPCOpXc3NTw+U=; b=B5XmrbCs5CeHowGdt1LEaDZK8zrF0PZNnAiQPzmb+jNo1E8xzv1XTSiKo/Hhvioiy7 0ldTfMQjj2W5ZGk4i8eYJ76ixDQp4ZigklC/jSUmWWqcslu8wiZULyhC8byYOJR9vTbG 8TgtfrDQWwuBdMCIe+i4emi+FHNek9rN1JqGuWHR2azYtOcvmVIW9HeqdirlZrI4jJcl O8yi0XNIkWfzZg7gHzHEYYlshB/nm/vkr+RPi7WfchLn66oKC6KwAo8BQiGmJg8iXSGM uhT6qubQ4p/TTGEGCymQnJ9zEqk0cXyJyrnpU2y1KJ7gq+Bbu1EDvGTuqC5fG0TsPXfS 2n3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="JJ/EtR29"; spf=pass (google.com: domain of linux-kernel+bounces-22871-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-22871-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id v21-20020a05620a0f1500b007831b4b1bbdsi5327471qkl.369.2024.01.10.15.04.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 15:04:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-22871-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="JJ/EtR29"; spf=pass (google.com: domain of linux-kernel+bounces-22871-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-22871-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 373631C22274 for ; Wed, 10 Jan 2024 23:04:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8ADF44F8B8; Wed, 10 Jan 2024 23:03:52 +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="JJ/EtR29" 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 709794F88A; Wed, 10 Jan 2024 23:03:47 +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=1704927820; bh=t6qTg4+hvafGldknVqf3jODmxC5jGlYpKg7EK7DM02M=; h=Date:From:To:Cc:Subject:From; b=JJ/EtR29eTIsbcJ588Zmtjz2E6jDXJrZsaKITXfKkha3WYLh+UQKLPn+17s7MGqbb SyX/y77pWDfbgDRIuZaRErnDJm22EF6RgzZsTRTWevVdiapW5zd/qhoaklg1F06TmR ZwBoxy2KEaZ+tkTy9ajA8pcQCUhL0zx43j4fxByi9jk1QWXBtlq1FKaUAg/pzgceSS Oaz/mXSKGOlevIpo2UM51GfRFMXC5OGmKTK1XnS0ac7f9cZC06DljBwVoc0Jr8ATs9 ceqfC++/oWbPwncv3h1m05S60dCo+EiIGYnrtJPTHSQr5KhcI2wsuixvdDwJ4GU57b c4enJvJ7Ob2ew== 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 4T9NdR3XJNz4x43; Thu, 11 Jan 2024 10:03:38 +1100 (AEDT) Date: Thu, 11 Jan 2024 10:03:37 +1100 From: Stephen Rothwell To: David Sterba Cc: Christian Brauner , David Sterba , Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List , "Matthew Wilcox (Oracle)" , Qu Wenruo Subject: linux-next: manual merge of the btrfs tree with Linus' tree Message-ID: <20240111100337.3e9ef25c@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: 1787746419786334989 X-GMAIL-MSGID: 1787746419786334989 Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the btrfs tree got a conflict in: fs/btrfs/extent_io.c between commits: affc5af36bbb ("Merge tag 'for-6.8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux") 600f111ef51d ("fs: Rename mapping private members") from Linus' tree and commit: 08236d11031b ("btrfs: cache folio size and shift in extent_buffer") from the btrfs 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/btrfs/extent_io.c index cfd2967f04a2,c8aabe3be169..000000000000 --- a/fs/btrfs/extent_io.c