Message ID | 20240109095405.02bd795f@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-20166-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp1317624dyq; Mon, 8 Jan 2024 14:54:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IE3DSMneieC3JygVELN+R/BSwOQaFjj+ZjqeFim1djGPBw1HBjn9lMTVV59YsEjzj3LzJ6k X-Received: by 2002:a05:620a:90d:b0:783:2be7:9ed5 with SMTP id v13-20020a05620a090d00b007832be79ed5mr360110qkv.31.1704754479534; Mon, 08 Jan 2024 14:54:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704754479; cv=none; d=google.com; s=arc-20160816; b=BmMCi4JfT+kzYI5YGZrpDQIKlwQCd76iCW6udvm3c33PaHu08XcAn3Kh3bw3mHJsAP 7UxcBC3rXM0Nw1IGQh8OTxBPvQcUIjVa+OD2PPKvpIXFshlhRY4HwSkMh9OSOej73cwF J/IKdkCZjob36ycjKdiuQSDNMe0y5KxItZxbnaPr/LfwjllZGHTEz32vVIgB0z1TMuX9 hLxjG9farWJ1l+6hhIzabQQRpAEG6XBEw6IPJftyw1VbaQer+jqwXXpA+l2TBK0r5aB2 Zx+1UTK+iraAOJTMfSbSGcIByMX0yby6VVcZbBu1jcZ5Db+cPCHJCzBVU4CwMf+5Eqs3 HxXg== 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=VBF/byM1vm/iUxyCl1D+PwVWglAOTC24+zekK3GjUWc=; fh=zOTVlwFeJXrq0ZuACHwrjSLmxgcs0e26D/KtQD9ip14=; b=Y4s/PeT/iEkevxcy41UliSwKA0dTCihAAFBG1CqBFzfacXTpvfOdfyZA99mujD5tf4 EKv2tdw9Q8FvOJeE7CVbnF9orT155QuUkbZmBCoXKITTAopmOZ+tWmG+gFJpQeLsxlS7 MLeYV+KQ+6V8FSHIOWQygmaMWKsZUt3Teq1DBpRc/moKbHuMzY+OKUZMtgol07XP+48j eS866wQ83qX6C0HiACQnir1cd80dTwToTWcQRVZI7Y+fVqxJzyIXjwLdwvteKIG19QRp djUojgS6RTeyh0mxNhvZwZW37mixva3VhVRT7MJpJjqYYWC8kEs6Di+z3/Xmy/qzEMOn YQqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=W5GyNJOc; spf=pass (google.com: domain of linux-kernel+bounces-20166-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-20166-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 d7-20020a05620a166700b00781784aa6b4si689160qko.303.2024.01.08.14.54.39 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 14:54:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-20166-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=W5GyNJOc; spf=pass (google.com: domain of linux-kernel+bounces-20166-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-20166-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 4759A1C22FAC for <ouuuleilei@gmail.com>; Mon, 8 Jan 2024 22:54:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9853C41A85; Mon, 8 Jan 2024 22:54:24 +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="W5GyNJOc" 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 A04CF56740; Mon, 8 Jan 2024 22:54:16 +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=1704754449; bh=VBF/byM1vm/iUxyCl1D+PwVWglAOTC24+zekK3GjUWc=; h=Date:From:To:Cc:Subject:From; b=W5GyNJOc481nBtBBx1fxw2zP1bPRX7fYSvM/lW95zPf7jL//64ljUQLgeG7cUGph2 CsCylcItm7JT2h7Uf0iSlKoOvzJ6nRsAma/yOoeTLjF0Yx1fbZ7Oc5llI2YO0eWZT0 vxG9GW7krME/ln9M6lTGSaJ90mQWz6qahrWQT/l0g9xmrfsYY3ehN+V0VAcwExJU3A T57tAYPA6kHpoVnn2l6JDnDwoZGUI90iKp02uMTnf7Fle+g0L0tthG3Vm5lMUwzv+m b8LQ1j42xQmpyhQSWAX0Z+o9MVfTFOtiXTcA8Is08XYZ8v5nG3ugUCJKwV/o1luYSP FBkxJ5+N0u3Hw== 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 4T88WN3Q2Qz4x1P; Tue, 9 Jan 2024 09:54:08 +1100 (AEDT) Date: Tue, 9 Jan 2024 09:54:05 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: David Sterba <dsterba@suse.cz> Cc: Christian Brauner <brauner@kernel.org>, David Sterba <dsterba@suse.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, "Matthew Wilcox (Oracle)" <willy@infradead.org>, Qu Wenruo <wqu@suse.com> Subject: linux-next: manual merge of the btrfs tree with Linus' tree Message-ID: <20240109095405.02bd795f@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Q5zib2a=DHH=.b+Zu7rSaoh"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787564632832603483 X-GMAIL-MSGID: 1787564632832603483 |
Series |
linux-next: manual merge of the btrfs tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
Jan. 8, 2024, 10:54 p.m. UTC
Hi all, Today's linux-next merge of the btrfs tree got a conflict in: fs/btrfs/extent_io.c between commit: 600f111ef51d ("fs: Rename mapping private members") from Linus' tree and commits: 08236d11031b ("btrfs: cache folio size and shift in extent_buffer") 13df3775efca ("btrfs: cleanup metadata page pointer usage") 082d5bb9b336 ("btrfs: migrate extent_buffer::pages[] to folio") 09e6cef19c9f ("btrfs: refactor alloc_extent_buffer() to allocate-then-attach method") cfbf07e2787e ("btrfs: migrate to use folio private instead of page private") 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 b6ff6f320198,c8aabe3be169..000000000000 --- a/fs/btrfs/extent_io.c