From patchwork Fri Jul 14 00:02:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 120149 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2180264vqm; Thu, 13 Jul 2023 17:35:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlHwyCdQnM+lxEXerKhX3fjpo7N/R8F8LOuQgyCPBCCQA/9S7lfp5Bj2+UmioMFU3XnF6zvW X-Received: by 2002:a5d:6102:0:b0:30f:c1c3:8173 with SMTP id v2-20020a5d6102000000b0030fc1c38173mr3140547wrt.26.1689294924550; Thu, 13 Jul 2023 17:35:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689294924; cv=none; d=google.com; s=arc-20160816; b=zWa0xOLSfrX1Q7gDcPaD+5BjEC33ujBQ+oB6RK+pfoE1F4D3GJG2urDm8kIIacDUNE SuTpDJQZ2BhFNqYSLEMhLhCnNjKtIy7jD/Tt+aO4hgvP8Y+/MZAoeKYWoE4dG8wn1WTC ZyHQHEquBXaVK639M22lk7mfyDz/EUa/DpKQUnHtjp14rpyVZMiNsrd2MM1MD4zUPXDd aGAOPUQ79bhvhAmgMy2dehyuREyfMiWCsVt2QlCivzZA48ek+wZMGJ2x3uLvTU6YBz8r v1YcJ2THE8xg1WcZsCn8IEvZCJiPCkg7IZ5XZUnqdyreclxbuv6TuUjJvDNi7uabKX0i AHfQ== 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=URHyxa1dMA7/Qw7JnFbPE53OJDOdmKw1KXbuFMFCY9g=; fh=3xE3dNasG5/lT5czhZYNDh+r7gjEWBrW+/StOSNgzLo=; b=JaUDFa8LnWwsNd5wnjYAyX/uJgT44OtNwxd2FjP6YZu/eIzYfTn+lZ5mvdJjg9/X/I jvUAv/kJdIsEKC+kzf1aWgN876t1HKrRr3I5Q5NivTTOZAl/45uIovfPpGx3fjEXL++Y jiBAUfgk1z4bOlq2RCGB/4gzDzgU0vutLNhpeo77TQHhK8sYNWrtxGngZbi09luNpzfd 4wSosUyODrY8Xg925b8tB8blRUXH5h+6k+BEMzmWdo8O9qqlm0YxS/dE8tb3ogZsj2lF YAMah7OTpWWoYZFhNBj9KNZe/9ci+afw9QrdHopzZetjrF2aam+V22mDf9TDbwMKn4u/ Ge+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Q8e19YGX; 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 f20-20020aa7d854000000b0051e0c826f41si9392162eds.169.2023.07.13.17.34.59; Thu, 13 Jul 2023 17:35:24 -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=Q8e19YGX; 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 S232786AbjGNACP (ORCPT + 99 others); Thu, 13 Jul 2023 20:02:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229976AbjGNACO (ORCPT ); Thu, 13 Jul 2023 20:02:14 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 530D526B5; Thu, 13 Jul 2023 17:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1689292927; bh=URHyxa1dMA7/Qw7JnFbPE53OJDOdmKw1KXbuFMFCY9g=; h=Date:From:To:Cc:Subject:From; b=Q8e19YGXirL8mmrQkucNwKDswj+9I4hbnZdTGOkyz0zdV3bfUPbLh6ERXpVVvEglw qMlaLFLxhFQM3ZZnj5UBnRX04irNfcZ3rorZShYWAxpXrR3eT4qZ9xM/aT63kRMsfF VwjbJbedvbDKGmw0cISq9BtqXpipMRYpR20OK3OhbxyHIpHMev6ZgypS4GlozQNHmW Zsjj4OxWJj31urjE+ul75YQ2VsihjeE7khLs7QaMjH16Xr6TRdaCPda76dGjBhP73O ssTvLqD9HuBwqcidXoZdNar7DCOh446WOpUBjhQKx/Bi3MzxkUS7jYMDzPMSdIB/GZ dZn5P8mO3G6HA== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4R2BVR1dm1z4wqZ; Fri, 14 Jul 2023 10:02:07 +1000 (AEST) Date: Fri, 14 Jul 2023 10:02:05 +1000 From: Stephen Rothwell To: Christian Brauner , Andrew Morton Cc: Carlos Maiolino , Carlos Maiolino , Chuck Lever , Linux Kernel Mailing List , Linux Next Mailing List , Lukas Czerner Subject: linux-next: manual merge of the vfs-brauner tree with the mm tree Message-ID: <20230714100205.35b99670@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: INBOX X-GMAIL-THRID: 1771354114997813889 X-GMAIL-MSGID: 1771354114997813889 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: include/linux/shmem_fs.h between commit: 1a93dd24f1be ("shmem: quota support") from the mm tree and commit: ad9717ca487a ("shmem: stable directory offsets") 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 include/linux/shmem_fs.h index c0058f3bba70,a5454a80ab30..000000000000 --- a/include/linux/shmem_fs.h