Merge PR ceph#59809 into main

* refs/pull/59809/head:
	COPYING,common/*s390x*: distribute under Apache 2 license for s390x
	arch/s390x: add license notices, use LGPL

Reviewed-by: Ilya Dryomov <[email protected]>
Reviewed-by: Anthony D Atri <[email protected]>

Author: batrick

COPYING

@@ -225,7 +225,6 @@ Copyright: 2015 Red Hat <[email protected]>
            2018 SUSE LLC
 License: GNU Affero General Public License, Version 3
 
-Files: src/arch/*s390x*, src/common/*s390x*
+Files: src/common/*s390x*
 Copyright: 2024 IBM <[email protected]>
-License: GNU General Public License, version 2
-         Apache License, version 2.0
+License: Apache License, version 2.0

src/arch/s390x.c

@@ -1,4 +1,16 @@
- #include <sys/auxv.h>
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright 2024 IBM Corporation
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License version 2.1, as published by
+ * the Free Software Foundation.  See file COPYING.
+ */
+
+#include <sys/auxv.h>
 
 #include "arch/s390x.h"
 #include "arch/probe.h"

src/arch/s390x.h

@@ -1,3 +1,15 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright 2024 IBM Corporation
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License version 2.1, as published by
+ * the Free Software Foundation.  See file COPYING.
+ */
+
 #ifndef CEPH_ARCH_S390X_H
 #define CEPH_ARCH_S390X_H
 

src/common/crc32c_s390x.c

@@ -1,14 +1,29 @@
 /*
- * CRC-32 algorithm implemented with the z/Architecture
- * Vector Extension Facility.
+ * CRC-32 algorithm implemented with the z/Architecture Vector Extension
+ * Facility.
+ *
+ * Copyright 2024 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
  *
- * Copyright IBM Corp. 2024
  * Author(s): Hendrik Brueckner <[email protected]>
  *            Anton Blanchard <[email protected]>
  *            Bryan Chan <[email protected]>
  *            Chris Zou <[email protected]>
  *            Aliaksei Makarau <[email protected]>
  */
+
 #include <sys/types.h>
 #include <endian.h>
 #include "crc32c_s390x.h"

src/common/crc32c_s390x.h

@@ -1,3 +1,22 @@
+/*
+ * CRC-32 algorithm implemented with the z/Architecture Vector Extension
+ * Facility.
+ *
+ * Copyright 2024 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 #ifndef CEPH_COMMON_CRC32C_S390X_H
 #define CEPH_COMMON_CRC32C_S390X_H
 

src/common/crc32c_s390x_le-vx.S

@@ -1,14 +1,26 @@
 /*
  * Hardware-accelerated CRC-32 variants for Linux on z Systems
  *
- * Use the z/Architecture Vector Extension Facility to accelerate the
- * computing of bit-reflected CRC-32 checksums for IEEE 802.3 Ethernet
- * and Castagnoli.
+ * Use the z/Architecture Vector Extension Facility to accelerate the computing
+ * of bit-reflected CRC-32 checksums for IEEE 802.3 Ethernet and Castagnoli.
  *
- * This CRC-32 implementation algorithm is bit-reflected and processes
- * the least-significant bit first (Little-Endian).
+ * This CRC-32 implementation algorithm is bit-reflected and processes the
+ * least-significant bit first (Little-Endian).
+ *
+ * Copyright 2015 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
  *
- * Copyright IBM Corp. 2015
  * Author(s): Hendrik Brueckner <[email protected]>
  */
 

src/common/crc32c_s390x_vx-insn.h

@@ -1,10 +1,23 @@
 /*
  * Support for Vector Instructions
  *
- * Assembler macros to generate .byte/.word code for particular
- * vector instructions that are supported by recent binutils.
+ * Assembler macros to generate .byte/.word code for particular vector
+ * instructions that are supported by recent binutils.
+ *
+ * Copyright 2015 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
  *
- * Copyright IBM Corp. 2015
  * Author(s): Hendrik Brueckner <[email protected]>
  */