Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp102240rwd; Wed, 31 May 2023 19:51:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4w/CG7IBbzsJlxuwo6k1o7zAKXM4qP3GLkCR/UhsbrdRIpqMtLQNSQbW4+ZB6VJ1var/5A X-Received: by 2002:a05:6808:23c2:b0:398:50f5:f003 with SMTP id bq2-20020a05680823c200b0039850f5f003mr6515589oib.19.1685587891191; Wed, 31 May 2023 19:51:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685587891; cv=none; d=google.com; s=arc-20160816; b=AxJpUXIRPPpwcMXJV9ckrSi4qPcx7bK6PULWiWPzU6Q0KYiIXTTIC4MPyWetzTXoot Edu4bIrZsZB97nrurQFOHApuo4hQ1Vz3qpixSRkQ7hDqzK0GT/X+gSrV6Bq9rvY7jN9C pbMOO4wuUh0s0Y/8nX9oTqnADmUw4Y3Rg15+RROHuviVeZ1rLwqAGbbxA1EPBLjDyNfi Uhlgqo74xsVTnoDqGrN6/vWLJ9oqyZ1pqPDaf3T1WLwuD1ehFdrgrFZa+WzPWwG5kOgl m64nwA/PVSU04Eq12t7SxdrHDsss6bgL/w1azp76JwsTMbmUYHEi4KoYvvxhLODGLe6W GSmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:references:in-reply-to:user-agent:subject:cc:to:from :date:dkim-signature; bh=zjS2g3PTs/xfJ0o2S6Ienvpo7419GyOGWPlFNxHsRNs=; b=qNIdXiVppA0IZ/IeEGCEXnjWKC4ql2KArLh2qWTu41GxDNSlTgydgnkYlrG60oQ33s K1oCisEkoL2XnHLK69e9corepuSPaI3vAHXJ/Hkmp/yolguRosz23Xj45pDwMEvU76bz 2goto3y8V1ZKKSJLZOBwkSpNSdecqDiJCLE+ZTUklBhvs/H5Dq4JyVeXRS4BP0OPYx2I hVyo3hsBsc0zpQueCz1Wjlxu/mEUkxefgcADbwvzChBSEhZv0hBXIlgZ43jxu8jid2V7 BXPPlHrCRHkXyqOD9wdpJMfq/hLRsCPk3DgG0tdALndj73KeF5A6B6OMUvO5aohQGGoH KX1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=B6eTO2Ih; 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 cp18-20020a17090afb9200b00256b9601cffsi364354pjb.79.2023.05.31.19.51.16; Wed, 31 May 2023 19:51:31 -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=B6eTO2Ih; 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 S230123AbjFACng (ORCPT + 99 others); Wed, 31 May 2023 22:43:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229588AbjFACnf (ORCPT ); Wed, 31 May 2023 22:43:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18FE98E; Wed, 31 May 2023 19:43:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A95B764047; Thu, 1 Jun 2023 02:43:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE283C433EF; Thu, 1 Jun 2023 02:43:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685587413; bh=oY+xHQYhmKKcwx/KFgT6bDL0acZ4b8k6V5/PXp21OD0=; h=Date:From:To:CC:Subject:In-Reply-To:References:From; b=B6eTO2IhPq4sxJWdqy1PlR5e96YguoOBStRC4KnUmyaHo8FTUHFkUPbcePIoDMukC rJ53eJPk9ICrj7MLdRlIxlAz6LC0ixyPJeMVWqM8ZLxRvVhPy9L7oT1N8B3iZKhK1B WdH+uxFnvDNvCYcLND97mcEuZkF+76lKdxvzJuJc44yfP9gXN7n8gv8OiQA1zIJ/3v HsoZROJ58XSR02ECJacOa2LMsgb2wYzeXb3Vkw8quzh4tQe/jdP0AjaQRVi0l6MAxx syOaU+a2zgSr5ZAwwrmILugxkzJj7W1kkZTIY7mfDBjAKXAtQAhOB0iume13cLIZZM sOvTwiSSctf1A== Date: Wed, 31 May 2023 19:43:32 -0700 From: Kees Cook To: Stephen Rothwell , Kees Cook , Andrew Morton CC: Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patch in the kspp tree User-Agent: K-9 Mail for Android In-Reply-To: <20230601123056.59b281c8@canb.auug.org.au> References: <20230601123056.59b281c8@canb.auug.org.au> Message-ID: <81BE1A87-DED7-4A7C-AFB8-A5AA54D19150@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 May 31, 2023 7:30:56 PM PDT, Stephen Rothwell wrote: >Hi all, > >The following commit is also in the mm-hotfixes tree as a different commi= t >(but the same patch): > > f7223ccc138b ("string: use __builtin_memcpy() in strlcpy/strlcat") > >This is commit > > 0af9b29c6efd ("string: use __builtin_memcpy() in strlcpy/strlcat") > >in the mm-hotfixes tree=2E Andrew, should I drop this from my tree? --=20 Kees Cook