From patchwork Tue Oct 31 22:50:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 160378 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp67281vqx; Tue, 31 Oct 2023 15:50:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKZBeYihO/IA2jnU8fONl5+TPCeQO/MJRQbv5khgpelvx8wAfWqBdA6JpeA5l7ynpneZeV X-Received: by 2002:a17:90a:5108:b0:280:25b8:ae82 with SMTP id t8-20020a17090a510800b0028025b8ae82mr9406118pjh.20.1698792653758; Tue, 31 Oct 2023 15:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698792653; cv=none; d=google.com; s=arc-20160816; b=Za6WUOW4MTkwUDSdan2u0a8MycY/s3G+KiKsa60WAwHHwG+4g7eZicOYexiE/lo4Kx QB+ySzQpX+ZrX+HcmrF1wF1oqZXnnw5VRWuXf3oFphPqPNkHnNTSILpXL4wfvShiZwYz nuaadSTuB6N6r6F8l2HF2wujk+OEOS/TARMJt6RAZpik3hJJClll3WqB3FXK7bjVYyB9 /HEHsYZj3csuiJDOdqBdtO15YvtUqbjaDhJD3RUhRo1csp9dEXhm2stF9XNkZAwei1QH xJe04B2BQViy45dlrA6RsG2pdtOmbPVb+rENWJ6AFcjxh98l49opAjvFGSfXjWgfMrbF rrrw== 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=TGLDyaxbXwrRXxeoq6uzWjCu5hnLNuWS15sOBL5JZQc=; fh=y5ebvJitbW2f1FHHj81i0DAI6fKpQgRXpkddqs+/6n0=; b=yP91cIyZoze6VYi5kDcxe4hYgXxSTyU4tWyC1Xl0QV6M22arPVP3/hPXIFwMnHC0t6 ZF7mdlnhAz2XVxG1/aKqYfiKP0t6ItihjNxqCBULoqmRCd9g5mN0WS4XzPrfbjt9Jk9S SB1HZqd+EIFAfE1wqMxIP5084AyEXYxTUW9NdlGWMKgzb3Y15PfleOopW73R/i/kf87b tcHKYZkDkPQYuUsEcvCq9NbfefpticE9y+9qyMDB0zoA5Am/QYbf4MRdjuoYf6sbncbr t98sFuUTxFtQ7RMvVz3W/ojHCjBy75BEBbH4rni5X4p0JQnvDKUyeQGkxZy+zPbUSfGz VoNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=QcdMIQWL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id v23-20020a17090ac91700b0027cf3fd376bsi1614634pjt.28.2023.10.31.15.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 15:50:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=QcdMIQWL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 8D25B8076E46; Tue, 31 Oct 2023 15:50:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344871AbjJaWuJ (ORCPT + 33 others); Tue, 31 Oct 2023 18:50:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344196AbjJaWuI (ORCPT ); Tue, 31 Oct 2023 18:50:08 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16B42B9; Tue, 31 Oct 2023 15:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698792603; bh=TGLDyaxbXwrRXxeoq6uzWjCu5hnLNuWS15sOBL5JZQc=; h=Date:From:To:Cc:Subject:From; b=QcdMIQWLryv6F7kJHQ3a3WJ8m3eoXkiVKHzBWp3KRWu2YNdQS5Oq6jvtDFxZNP5Iv 9K3Akj9WRTNbZdS0dGmJ07LlTXRd5NI2z+6v47CnaSF+AKWzOWF7Bh0JLsDf12KBRM +9afXB39vH5tYA0Zi/YJxyh/eQHGwK7EL5YoCEUag15Yrvb/hrN/q8kml2jnq7e2Pc XKVgHqY2EQzdJ8nywqyFJM67Nk1P1nJO3QTY7E2enQdc9b1eNGzxSRW3MySqyVDlyf IS9vttrG0c7dO3oCSXorljBWlQqOoLuL/98iZRnSbytj6P3AFMk7ZY8N6g+Pap9faF +DHY7X1IE8GQw== 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 4SKlhW1dykz4wcH; Wed, 1 Nov 2023 09:50:03 +1100 (AEDT) Date: Wed, 1 Nov 2023 09:50:02 +1100 From: Stephen Rothwell To: Kent Overstreet , Andrew Morton Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the bcachefs tree with the mm tree Message-ID: <20231101095002.737cedb8@canb.auug.org.au> MIME-Version: 1.0 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 31 Oct 2023 15:50:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781313205457910604 X-GMAIL-MSGID: 1781313205457910604 Hi all, Today's linux-next merge of the bcachefs tree got conflicts in: fs/bcachefs/btree_cache.c fs/bcachefs/btree_key_cache.c between commit: e1ae18bfd5bc ("Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") (this merge commit includes fix up for the shrinker allocation changes) from the mm tree and commit: a1d97d8417d3 ("bcachefs: Fix shrinker names") from the bcachefs 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/bcachefs/btree_cache.c index 5e5858191905,0b084fbc478a..000000000000 --- a/fs/bcachefs/btree_cache.c diff --cc fs/bcachefs/btree_key_cache.c index f9a5e38a085b,3304bff7d464..000000000000 --- a/fs/bcachefs/btree_key_cache.c