From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA112C433EF for ; Tue, 14 Jun 2022 03:34:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234298AbiFNDeZ (ORCPT ); Mon, 13 Jun 2022 23:34:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230431AbiFNDeY (ORCPT ); Mon, 13 Jun 2022 23:34:24 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB89D2F3AB; Mon, 13 Jun 2022 20:34:23 -0700 (PDT) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4LMYvd400Fz4xYC; Tue, 14 Jun 2022 13:34:20 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1655177662; bh=aVBDcex9xuVU47iI1YrP1wnTDjoykVLXNbXEs85vAzI=; h=Date:From:To:Cc:Subject:From; b=iuH8mfb92AxAZnH/ZoPgDfXuLlbAIER8Ekd1Y40VPhZWDujYrrzVZgfGNmwDUuOck ik8sdmAAy6c+zRwgjjKmgbfuZ0T3II/aapdYlDOFw4aL8LMlG0j3VSAGLEbPJavvI6 5LxLDKix9mxUnlz0yUyk/R3MBwgS5LGON54cHClEnhZ5Q2+4D7IMdrA1NSvxOPaA7g GBzUhGoYw3CwMbhOamDvS43blLDkKKISSvEaTwvBfjZVbSl0XqYc9k/KqaWMun9/dz qVVuQEMqSrIHIt50WWgAiCHAJgZ8+BxYEEAUxJOVCE1UF8PDTYa43LonKAlO4aZXGS PXRp/epF7fUKQ== Date: Tue, 14 Jun 2022 13:34:19 +1000 From: Stephen Rothwell To: Matthew Wilcox , David Sterba Cc: David Sterba , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the folio tree with the btrfs tree Message-ID: <20220614133419.5e10ba00@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/KkjETaiVYXQffIj1+s/J1yg"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/KkjETaiVYXQffIj1+s/J1yg Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the folio tree got a conflict in: fs/btrfs/disk-io.c between commit: fe9b88cb7288 ("btrfs: use preallocated page for super block write") from the btrfs tree and commit: 020ae1ea6060 ("btrfs: Use a folio in wait_dev_supers()") from the folio tree. I fixed it up (I did not know how to fix this up, so I used the former - effectively reverting the latter) 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. --=20 Cheers, Stephen Rothwell --Sig_/KkjETaiVYXQffIj1+s/J1yg Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKoAbsACgkQAVBC80lX 0GwLIggAosxPOEsmzhOKQD4JnaidypIVfg2pj/O20eeZaJ6QVh3Ho1jwD7LKv70u 6MyUEuFgzINKHZOL8qlSZMl6IgwF5azHKz++6xDic8fodQh7RDfvk3IefsXHxzKy 9WhI6JiwIrhOrXshNTtR2an7HUn9VkPe/17FsnE0zZT7yb65Kt0HWnbPVF5tnHtW Gkz4NUBxTebgIHRCzHdk/klUvZt1JXn+PJnJGTCyA4zIbT8QZkNBWp/EsB3CpFUQ KStwYkwRdZujsVrbpdis7wNb/Zll3oVoypNmFyv/qjspixRtBbp0blCraYnP/occ wWF8vsNDuD6hnoKA74XJCcQ/LJ7dbQ== =uPzH -----END PGP SIGNATURE----- --Sig_/KkjETaiVYXQffIj1+s/J1yg--