[PATCH v1 1/3] arm64: lib: Import latest version of Arm Optimized Routines' strcmp

[Will Deacon]

On Thu, Feb 17, 2022 at 10:23:09AM +0000, Joey Gouly wrote:
> On Wed, Feb 16, 2022 at 06:36:12PM +0000, Robin Murphy wrote:
> > On 2022-02-16 16:44, Russell King (Oracle) wrote:
> > > On Tue, Feb 15, 2022 at 05:07:21PM +0000, Joey Gouly wrote:
> > > > Import the latest version of the Arm Optimized Routines strcmp function based
> > > > on the upstream code of string/aarch64/strcmp.S at commit 189dfefe37d5 from:
> > > >    https://github.com/ARM-software/optimized-routines
> > > > 
> > > > This latest version includes MTE support.
> > > > 
> > > > Signed-off-by: Joey Gouly <joey.gouly at arm.com>
> > > > Cc: Robin Murphy <robin.murphy at arm.com>
> > > > Cc: Mark Rutland <mark.rutland at arm.com>
> > > > Cc: Catalin Marinas <catalin.marinas at arm.com>
> > > > Cc: Will Deacon <will at kernel.org>
> > > > ---
> > > >   arch/arm64/lib/strcmp.S | 238 +++++++++++++++++++++-------------------
> > > >   1 file changed, 126 insertions(+), 112 deletions(-)
> > > > 
> > > > diff --git a/arch/arm64/lib/strcmp.S b/arch/arm64/lib/strcmp.S
> > > > index 83bcad72ec97..758de77afd2f 100644
> > > > --- a/arch/arm64/lib/strcmp.S
> > > > +++ b/arch/arm64/lib/strcmp.S
> > > > @@ -1,9 +1,9 @@
> > > >   /* SPDX-License-Identifier: GPL-2.0-only */
> > > 
> > > Looking at the LICENSE file in the above repository, it appears that
> > > this code is licensed as "MIT OR Apache-2.0 WITH LLVM-exception".
> > > Shouldn't the SPDX line be updated to reflect the origin license of
> > > this code?
> > 
> > This is noted in the commits which first imported implementations from Arm
> > Optimized Routines (020b199bc70d and earlier):
> > 
> >  "Note that for simplicity Arm have chosen to contribute this code
> >   to Linux under GPLv2 rather than the original MIT license."
> > 
> > Apologies for the confusion - I should have mentioned that to Joey
> > beforehand, if I hadn't completely forgotten about it. I think it's just
> > been implicit that we'd continue to follow the same approach going forward.
> > 
> 
> Yes, I didn't mention it because I was just being implicit.
> 
> I've added a note about it in the commit message, and will send out a v2 after
> deciding what we should do about the conflict with
> https://lore.kernel.org/linux-arm-kernel/20220216162229.1076788-1-mark.rutland@arm.com/
> (since I may have to rebase the patches onto a different base).

Please just send a new version based on -rc3 and we can figure out the
conflicts when I merge it together.

Will