From patchwork Tue Nov 21 23:31:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 168036 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp980409vqb; Tue, 21 Nov 2023 15:31:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IF+V4vPJ4oAu+Ej/rytu8gIJJqhMnxaBpBYyNmaVx5LhnakV0G4MySin82zHrJRbiDqU5pV X-Received: by 2002:a17:90a:ad09:b0:285:1a29:6131 with SMTP id r9-20020a17090aad0900b002851a296131mr5871696pjq.21.1700609507925; Tue, 21 Nov 2023 15:31:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700609507; cv=none; d=google.com; s=arc-20160816; b=OxVCyyoKdC/WxK0b4DmzWe1BT9dmKAb8vvqtxBxdlgZ7Zng+9B8EOjjBE6AJWI8skK CHSvaShldLAL8GPZFSHmFzg/QoXcmt1OR1Aq0COpPBSiU+2hL7lznBq1ij00iI7/GjYh gLT9yvjgHYYEbKs9Cbnpya4C387rmWBPz7d2rXzQ5PqRjKnzJWUoMiuxcnjG+2YbJc5z dUlioWlT9o0zbe5XAw03JvWw1Kn2a2JMzmxcZDzLTLxQ61pcWM0VCyNi8BF8G0SfHzmS kzOojlSdGfo1Wx/P1+3/ss+6Gwa32mSjFxbakP+UlIL7uYYuDCn+ySkBHOQ5/5S8bH3r KUEg== 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=vm3LHH7rKIIonbHQ6vl80PvHC1BET5XzshuquqAVAn8=; fh=5KlLbbAnQ0yIk1kqjBoK+7uR6DXuZNOzYySRA0DavPE=; b=ENshRWClVAMn+BOQ+Pdv9BDWtzQ8ueYYUXRnndtL6c+IZq+yx0lrOiSlSHj6fhCZr7 NvN03zlgDrEsNM4VGd4Q6p0+rCucZOxdu6IJHYzMQR49DEZ38UyqRlRT6abdA1yGe1By lCilh3XJ9Ve0UpsmgvBVRpxv8RTCZSzRtTQb9xDDQxhM2MuZsNjfvaGUbllKacReElSd N2D3ZzTstFWWaaX3vDLoU1gmg+njBI1u1bitGdFWn3vThc3VKqcwTMsUhaYcgDO9Pu/S Mt1G50uHrhMuy/JMDmozJR8R1ebwlMPTrmgpEHND4Y5p59JKaCpEef5yVnWR2lDV6uk/ WpXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="rL/oebaq"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id fv6-20020a17090b0e8600b00283a212e16bsi153503pjb.165.2023.11.21.15.31.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 15:31:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="rL/oebaq"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 2EC0780295F2; Tue, 21 Nov 2023 15:31:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229620AbjKUXb3 (ORCPT + 99 others); Tue, 21 Nov 2023 18:31:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229480AbjKUXb1 (ORCPT ); Tue, 21 Nov 2023 18:31:27 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD508197; Tue, 21 Nov 2023 15:31:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1700609481; bh=vm3LHH7rKIIonbHQ6vl80PvHC1BET5XzshuquqAVAn8=; h=Date:From:To:Cc:Subject:From; b=rL/oebaq/ssFWqmAON1HNvciwD1Dm+RJDL2+GoNxyKmTZshZ/CXc+v+W5FlR9UzZ2 3eleu5fRDAEE3S7xJRLZRgk5w7K0zzyr0BMOvya70T4vXmEdb99IbsLLMFfj3DMhXY //G1pAkIUiYyLFKLKqryFumdgrCUPhHNboONCzYrIRGOJXRCbOZMvxSssrAlUKhA9m GNtjEDLZihNUhfa1KR+goEv3nNSBXNDCYfovxMfoTIaqXEYvBPDvP+4c0GGX2EoMKq R8ke10MFcsap1ogGM/0na0QjkijxPpk0xvlyxEMQzmq5cgT25YRkbWtJAqMgil5Ydh tSlHp8SVKqmPg== 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 4SZgcS6vYFz4wc6; Wed, 22 Nov 2023 10:31:20 +1100 (AEDT) Date: Wed, 22 Nov 2023 10:31:19 +1100 From: Stephen Rothwell To: Christian Brauner , Andrew Morton Cc: Linux Kernel Mailing List , Linux Next Mailing List , "Matthew Wilcox (Oracle)" Subject: linux-next: manual merge of the vfs-brauner tree with the mm tree Message-ID: <20231122103119.34d23955@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, 21 Nov 2023 15:31:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783218315570348643 X-GMAIL-MSGID: 1783218315570348643 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/buffer.c between commits: 2c68861ed127 ("buffer: return bool from grow_dev_folio()") 5334c6480adb ("buffer: calculate block number inside folio_init_buffers()") from the mm tree and commit: 488e2eea5100 ("fs: Rename mapping private members") from the vfs-brauner 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/buffer.c index 4eb44ccdc6be,5ffc44ab4854..000000000000 --- a/fs/buffer.c