| Message ID | 20231113092340.6555b428@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp888719vqg;
Sun, 12 Nov 2023 14:30:13 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IHn7Dqxf5TOUV+kf54FmpNlzH+THE7mUbOfe3NDV/2wrndYZ+reLKlwHHEA1JMWPWbC5q/l
X-Received: by 2002:a17:902:d346:b0:1cc:2151:2b36 with SMTP id
l6-20020a170902d34600b001cc21512b36mr3311295plk.55.1699828212875;
Sun, 12 Nov 2023 14:30:12 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1699828212; cv=none;
d=google.com; s=arc-20160816;
b=qNtORRd4uglM6S57FQm8J8X9KM9kHbos8By8CCmLLP3gB0FADJThXj+g1QdrSDKW/w
w7Hz0lI9n1f3aweY6MnMGaQGxLhZJIg0Lv9pOC5LHlNsdNLA6TbMwy0Pis7zYPm260t0
aiGiI7DVqOi1i0cqVLhX0iZaec8VKvpymJ06/4hcebJ6GCE/ikGAoYIHz4LS4kPGxMlV
9DfQN4sfWkZ0HXS03r4RDCTSMk0GQIIhw5xQUKnLaHqFXqX+9/WLHg3h3EgDJZAAYK5N
9vfpIQOUecvoaYB29ubpFdOChAq6xEywMp/ttLBxfw/Jtwv/IX8GfXwvAzWKghL+k9F7
U96w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=gpKOZ2ZliO+ojYZiPqXGUp9onC1Hm/oLrNozyclSdjQ=;
fh=rBm1cDLHb8IkxOMyKhL5Yh0IG6J8OSRGEVMigf+eLGU=;
b=lqdayLj3k7EfBRHv5otUKviCLNwlXNCcrmamX5egmvjwImM2UeTDsQINTvL3IbaxzU
D3I+qMI/hvlW3+dyykKHgnZzFhE3cJLA0Y3ttOMIAeW+T2lzUYpQU1nKVjSFgeMN08NJ
gSweUPZ6A/tuh03A7BhuH641PnVVY0ExEQjFPWJWeIaKBhP4f1AQu/OcfIsiHWzm4GP4
KWoeM9aJwz8NHdw/kzc+V72SXeW7JnFv1xyFlA4gG/h5vP4HtgJaDgOD35Z/7Syx4WiY
tikMJjk828vjCTPjDJnutqPb5yfLNuTgPg4fCFkin7NxEu8c0C9QY91+MVdzAQBCLeQB
vN+w==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RB4fq6gB;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:8 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8])
by mx.google.com with ESMTPS id
ij28-20020a170902ab5c00b001c0eefc0dfesi4410353plb.130.2023.11.12.14.30.12
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 12 Nov 2023 14:30:12 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:8 as permitted sender)
client-ip=2620:137:e000::3:8;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RB4fq6gB;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:8 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by fry.vger.email (Postfix) with ESMTP id 8FC728083DD7;
Sun, 12 Nov 2023 14:30:09 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S232389AbjKLWXu (ORCPT <rfc822;lhua1029@gmail.com> + 30 others);
Sun, 12 Nov 2023 17:23:50 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55288 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229737AbjKLWXt (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 12 Nov 2023 17:23:49 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97B2B99;
Sun, 12 Nov 2023 14:23:45 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1699827822;
bh=gpKOZ2ZliO+ojYZiPqXGUp9onC1Hm/oLrNozyclSdjQ=;
h=Date:From:To:Cc:Subject:From;
b=RB4fq6gB27P1LpBUYO4wUZJ25XEvUhmRegZaa5/4t2Sfz3g31Z6P+OoRrhU6SNQLv
wui9DIF1wt5KinWUV/VO2BUd9aCBsyBYVhzfV6HfSRkDcqOygFY8yzqeM4TgIBYhVC
RCyBI8VgCFH+InumoajjuX5JWq1WUpkkcllVb9c8tTV7TGRq1SmH981b/j3Djk5jqE
2cE0pqODJmiFnQlRIDlVOluFwR35PJ13LeKEQ/G4jxT6YAEaYTV/VMbE9o5JOdZH77
B3GwBuKMCzyKLJfOP4Kaa8p4teWSK6O0MJ1GH9EyWlulN1ZhK+XffFfMRL1KX+aG1D
8sOb4/bQL1Txw==
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 4ST6XY5tbFz4wdB;
Mon, 13 Nov 2023 09:23:41 +1100 (AEDT)
Date: Mon, 13 Nov 2023 09:23:40 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Kent Overstreet <kent.overstreet@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the bcachefs tree with the origin tree
Message-ID: <20231113092340.6555b428@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/GpQKy1LgZXVJwFlPpBVMGFS";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]);
Sun, 12 Nov 2023 14:30:09 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1782399068188191413
X-GMAIL-MSGID: 1782399068188191413
|
| Series |
linux-next: manual merge of the bcachefs tree with the origin tree
|
|
Commit Message
Stephen Rothwell
Nov. 12, 2023, 10:23 p.m. UTC
Hi all,
Today's linux-next merge of the bcachefs tree got a conflict in:
fs/bcachefs/btree_types.h
between commit:
ecae0bd5173b ("Merge tag 'mm-stable-2023-11-01-14-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm")
from the origin tree and commit:
ba1676c7af0c ("bcachefs: Split out btree_key_cache_types.h")
from the bcachefs tree.
I fixed it up (I kept the latter version of this file and applied the
following merge resolution patch) 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.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 13 Nov 2023 09:18:22 +1100
Subject: [PATCH] fix up for "bcachefs: Split out btree_key_cache_types.h"
interacting with "Merge tag 'mm-stable-2023-11-01-14-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/bcachefs/btree_key_cache_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/bcachefs/btree_key_cache_types.h b/fs/bcachefs/btree_key_cache_types.h index cfd09f519965..290e4e57df5b 100644 --- a/fs/bcachefs/btree_key_cache_types.h +++ b/fs/bcachefs/btree_key_cache_types.h @@ -17,7 +17,7 @@ struct btree_key_cache { struct list_head freed_nonpcpu; size_t nr_freed_nonpcpu; - struct shrinker shrink; + struct shrinker *shrink; unsigned shrink_iter; struct btree_key_cache_freelist __percpu *pcpu_freed;