Received: by 2002:a05:6358:7058:b0:131:369:b2a3 with SMTP id 24csp7792239rwp; Tue, 18 Jul 2023 23:42:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlE6jHp37DQMyudAvNOTTlyAmjbqia7ta8/nfg5QDFY8fPAG5xwVG563Ddr4Q7TyjRI+dG19 X-Received: by 2002:a05:6358:6f97:b0:133:a8e:6feb with SMTP id s23-20020a0563586f9700b001330a8e6febmr1602743rwn.12.1689748939931; Tue, 18 Jul 2023 23:42:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689748939; cv=none; d=google.com; s=arc-20160816; b=HteyqdUS/lbxk6Xj9DUg0L3lM7SzQhtk0JXOHpSwk3DSEmflhkSGQonUGE2rtlF0uu QNEbrg3L52sktU/G0qT3/LXtUmGBukVQij+BvuOSYWcMYya7xg1sF0IeIhM6Ur6Nri29 koGmvNZi02Tj7YcIwKuqBlmqfX7q+XlBMeBUocmk4uxgfTk27bOOVV/z8u5ByjHzHS3O aqIfmaE1YPZ6qzFR3O+8k78B01Iedvz7ZjD5gnn4eOMtBANuHcKTf2DfhV8vOUHY7S44 SMME8sKXfi3zi0NYifkmyXS4qsmFDwwgSQuZEJhGChdNPy5NQH52wi6N1AcvopErv0H1 5bCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=CCm9htYYl3xZjDjT9PkaQuprcFaAUBQWJJoYrY54T0Q=; fh=QHnVtXOrsUwd8tuoRVGpFbp8br+mhuW8z0e3oqo5SPk=; b=rExDv3RCKdcxUIrK8VeSEOKG0n+Pl2IFiDLMN+QkkS1/I7OQdsbnwbkNXQno4ofj7O 24BIVUEH583CO4lEWDUQBK+W3nHramcM1vBl1QO8EbcYqdBr1kVQvJAPMiGd14enflBQ qIv6I4rxXQC7S+1u2sTnDKgFJ6V5n+1FN02T4d8B97kM4TiWvBLyubOQTnTMAhFHc0SV EKJIHRk5t0zfgQ5f7CMtF6s4O7lMTw3jMvej+1qTatf7S98dMunL2Sv2Y+HqqkuFTPsi tb7hUvGRgOiO/PtM7lVvU7dM8XfG0qJE9BTUBejb6WZvE3ptWU98EbCUARmcBPgTA8+D 8BMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WqlsT3G4; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o13-20020a634e4d000000b0053490e8df4dsi2967236pgl.104.2023.07.18.23.42.07; Tue, 18 Jul 2023 23:42:19 -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=@kernel.org header.s=k20201202 header.b=WqlsT3G4; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230475AbjGSGQe (ORCPT + 99 others); Wed, 19 Jul 2023 02:16:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230450AbjGSGQ2 (ORCPT ); Wed, 19 Jul 2023 02:16:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F352A2710; Tue, 18 Jul 2023 23:16:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 444E3602F1; Wed, 19 Jul 2023 06:16:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 225A7C433C7; Wed, 19 Jul 2023 06:16:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689747368; bh=t+T4CR1LRsJIOLJggJMoEKySOyakc0tyKErwSDzZ6Ps=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WqlsT3G4uAFK3KMitHBb3xrH5iCdMBvy2Y5KDdGdfIkcp7+Yjs0rvop7POdBfp5Xq gtXNe3zgiXRShIdzqjkpS3Z4G+dUsJ/XzLYwE3KfXLG2zmdxfpYg9jq9ph6/A/dwOv CPfNlacsFkZyUFxAChqLEAV1tavOcbnziJLv8+7chalRiH71zxGaarffsE8ltbYYO5 UP224f/Ume2sJBJiEPZjAajkzm7Kp0SWf8mKMFOXuWXhpUbwOVJLLV3VEgEgddollY cZsA0VsdwEyc7a1PM1r+J6g3goEJCZ4bqLv14EY1LHzJFpWipShiu5MuKp0/UmJZ9+ b1tQ8WZlpDNBA== Date: Wed, 19 Jul 2023 08:16:03 +0200 From: Christian Brauner To: Tyler Hicks Cc: Stephen Rothwell , "Fabio M. De Francesco" , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patch in the vfs-brauner tree Message-ID: <20230719-dramen-komisch-9c43665a0a5a@brauner> References: <20230717101114.5add1194@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230717101114.5add1194@canb.auug.org.au> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,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 On Mon, Jul 17, 2023 at 10:11:14AM +1000, Stephen Rothwell wrote: > Hi all, > > The following commit is also in the ecryptfs tree as a different commit > (but the same patch): > > 8b70deb8ca90 ("fs/ecryptfs: Replace kmap() with kmap_local_page()") > > This is commit > > 031a0300f2c9 ("ecryptfs: Replace kmap() with kmap_local_page()") > > in the ecryptfs tree (where it has been since Sept, 2022). @Tyler, mind dropping it? I'll send it all in one go for v6.6.