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;
Date:   Wed, 31 May 2023 21:12:23 -0700
From:   Andrew Morton <akpm@linux-foundation.org>
To:     Kees Cook <kees@kernel.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Kees Cook <keescook@chromium.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patch in the kspp tree
Message-Id: <20230531211223.c8d8bf9f07eac1386410d13e@linux-foundation.org>
In-Reply-To: <81BE1A87-DED7-4A7C-AFB8-A5AA54D19150@kernel.org>
References: <20230601123056.59b281c8@canb.auug.org.au>
        <81BE1A87-DED7-4A7C-AFB8-A5AA54D19150@kernel.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Wed, 31 May 2023 19:43:32 -0700 Kees Cook <kees@kernel.org> wrote:

> On May 31, 2023 7:30:56 PM PDT, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >Hi all,
> >
> >The following commit is also in the mm-hotfixes tree as a different commit
> >(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.
> 
> Andrew, should I drop this from my tree?
> 

Doesn't matter, as long as we don't both drop it ;)

I wibbled over cc:stable, decided not to.  I did however queue it for
6.4-rcX.

I'll drop this patch from mm-hotfixes.