From patchwork Sun Jun 4 23:08:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 103048 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2360578vqr; Sun, 4 Jun 2023 16:31:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7sET8QXFJAqjZy53+wTk0dqnuv6DAIanAXLiqe6ItIey3sAbgO3Pm+UD/TUyWWL9DOUtXp X-Received: by 2002:a05:6a00:180c:b0:65c:6881:d86c with SMTP id y12-20020a056a00180c00b0065c6881d86cmr144992pfa.27.1685921517094; Sun, 04 Jun 2023 16:31:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685921517; cv=none; d=google.com; s=arc-20160816; b=rbFvNXQa9hyCWEH0dQq/jRNq0nIR2U/dyTNYITk607Xdmg7q7PLbY8pr6hoYXJw7tc mLCA7AAeUHnCKVDqMb0GGhjsT5yfXrcHrVYil1DCvHH9cmvOz8nGJfysLg5lMEp7yc0P FYnmmj8P48ZXu6GyHqBQIr742BncapS1dp3INVD5zaVcCdn8NvHcGB7DCrhLNycVptnQ 4vGRqmn4wyeC3laeZ1627EQs45zq5YtI9kU31Nu5QEtSLG1myeWu7V5VafhAoejjpaY0 Sug3CMxOyPnoETlhXffmF4ahLgRDqjxlCe70u4OIPxtAt8ErlljzYOpWFMP36Em3WKFz ECow== 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=QT7njgfyw1b4hMEcwfCFqDKc/Zf7MGdrMVgxHBXLNOc=; b=QN3C1i2oLNLWCR2Y7+HdjysEP7QZKL2vzUQrxh1kWwf6k7AD1dmgVVurPdjDagu5JK B2m/oe8Jp8XQh5DZ6fwMXTbCnQZrB8vB5fvvRiMDcTsw4QDTfkL7szFw/3hVWlyjy1Ek nTcwUD7KKCbQEppvfc7L9yGzE211/POuDyqQKrZptd2/5P4DuR2dJgfgwwKnTIIxzvB3 AbFJFx+eAHqtlgC1zYZ2SyWfeaLegOIB3RLqBmBTAnbZ+2VewulnzW6RUqtI2smZizxe U41mZVitvZ1z3fBWizeLJ2zyFvvdkjtWUq3/UEjPtUGkcNbWDgnOa0yCoq4k1e6LDJTa pW3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=E0CToDJF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h71-20020a63834a000000b00543ab0cbecfsi1113643pge.158.2023.06.04.16.31.42; Sun, 04 Jun 2023 16:31:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=E0CToDJF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232455AbjFDXIM (ORCPT + 99 others); Sun, 4 Jun 2023 19:08:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbjFDXIK (ORCPT ); Sun, 4 Jun 2023 19:08:10 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08532DA; Sun, 4 Jun 2023 16:08:09 -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 4QZC842bDPz4x1N; Mon, 5 Jun 2023 09:08:04 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1685920087; bh=QT7njgfyw1b4hMEcwfCFqDKc/Zf7MGdrMVgxHBXLNOc=; h=Date:From:To:Cc:Subject:From; b=E0CToDJFa27/q8HGw6kWQydR6nLTC80FJi/TordPwYfcTiP9OPBcGX7rVFWnXBZSj Ny/Kp5HXAOVBQp2/mNBmdiY2YtQOdqkMEHxvWUqeR4IPVSboEzeu92VL0+39cKn4Hs S1QKcJhpAEHwnRc5MXPfZF7GO+Cv45+9/Ow+RnDOZpVhRinPhlyn/dMZ3KArZTuRic s12VkBDCZrs+6msi4xzFr8DXy1me256KW/KJkw30ZPCm08IGTbh+K+/8lHhDnshKtr GqVct1DHlNWFS5Wk9NhrmkxOZM2e1B5b7Gl6csL5AxCN7PolczNyhEprlS4z5GNTE5 a12FGQ1/OjgrA== Date: Mon, 5 Jun 2023 09:08:03 +1000 From: Stephen Rothwell To: David Sterba , Andrew Morton Cc: Christoph Hellwig , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the btrfs tree with the mm tree Message-ID: <20230605090803.43597523@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767816840811732712?= X-GMAIL-MSGID: =?utf-8?q?1767816840811732712?= Hi all, Today's linux-next merge of the btrfs tree got a conflict in: fs/btrfs/file.c between commit: 39bf7bdb48fe ("backing_dev: remove current->backing_dev_info") from the mm tree and commit: 3564004ccddf ("btrfs: determine synchronous writers from bio or writeback control") 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/file.c index ecd43ab66fa6,f53b7b75092d..000000000000 --- a/fs/btrfs/file.c