common: add SPDX tags for files with mixed copyright

Alas, this can't be a replacement as we're not allowed to modify any
outside licensing notices, even if the meaning would remain the same.

src/common/mmap_windows.c

@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2015-2018, Intel Corporation */
 /*
- * Copyright 2015-2018, Intel Corporation
  * Copyright (c) 2015-2017, Microsoft Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/common/set.c

@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2015-2019, Intel Corporation */
 /*
- * Copyright 2015-2019, Intel Corporation
  * Copyright (c) 2016, Microsoft Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/common/set.h

@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2014-2019, Intel Corporation */
 /*
- * Copyright 2014-2019, Intel Corporation
  * Copyright (c) 2016, Microsoft Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/core/os_thread.h

@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2015-2019, Intel Corporation */
 /*
- * Copyright 2015-2019, Intel Corporation
  * Copyright (c) 2016, Microsoft Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/core/os_thread_windows.c

@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2015-2018, Intel Corporation */
 /*
- * Copyright 2015-2018, Intel Corporation
  * Copyright (c) 2016, Microsoft Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/core/os_windows.c

@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2017-2019, Intel Corporation */
 /*
- * Copyright 2017-2019, Intel Corporation
  * Copyright (c) 2016, Microsoft Corporation. All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/core/util.h

@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2014-2020, Intel Corporation */
 /*
- * Copyright 2014-2020, Intel Corporation
  * Copyright (c) 2016, Microsoft Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/examples/libpmemobj/libart/Makefile

@@ -1,6 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2016-2018, Intel Corporation
 #
 # Copyright 2016, FUJITSU TECHNOLOGY SOLUTIONS GMBH
-# Copyright 2016-2018, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

src/examples/libpmemobj/libart/art.c

@@ -1,7 +1,8 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2016-2019, Intel Corporation */
 /*
  * Copyright 2016, FUJITSU TECHNOLOGY SOLUTIONS GMBH
  * Copyright 2012, Armon Dadgar. All rights reserved.
- * Copyright 2016-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/examples/libpmemobj/libart/art.h

@@ -1,7 +1,8 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2019, Intel Corporation */
 /*
  * Copyright 2016, FUJITSU TECHNOLOGY SOLUTIONS GMBH
  * Copyright 2012, Armon Dadgar. All rights reserved.
- * Copyright 2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/examples/libpmemobj/libart/arttree.c

@@ -1,6 +1,7 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2016-2017, Intel Corporation */
 /*
  * Copyright 2016, FUJITSU TECHNOLOGY SOLUTIONS GMBH
- * Copyright 2016-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/examples/libpmemobj/libart/arttree_examine.c

@@ -1,6 +1,7 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2016-2017, Intel Corporation */
 /*
  * Copyright 2016, FUJITSU TECHNOLOGY SOLUTIONS GMBH
- * Copyright 2016-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/examples/libpmemobj/libart/arttree_search.c

@@ -1,6 +1,7 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2016-2017, Intel Corporation */
 /*
  * Copyright 2016, FUJITSU TECHNOLOGY SOLUTIONS GMBH
- * Copyright 2016-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/examples/libpmemobj/libart/arttree_structures.c

@@ -1,6 +1,7 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2016-2017, Intel Corporation */
 /*
  * Copyright 2016, FUJITSU TECHNOLOGY SOLUTIONS GMBH
- * Copyright 2016-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/examples/libpmemobj/libart/arttree_structures.h

@@ -1,6 +1,7 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2016-2017, Intel Corporation */
 /*
  * Copyright 2016, FUJITSU TECHNOLOGY SOLUTIONS GMBH
- * Copyright 2016-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

src/libpmem/pmem_windows.c

@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2016-2019, Intel Corporation */
 /*
- * Copyright 2016-2019, Intel Corporation
  * Copyright (c) 2016, Microsoft Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/test/RUNTESTLIB.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/RUNTESTS.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_nblock/TEST0w.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_nblock/TEST1.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_nblock/TEST2w.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST0

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST0.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST1

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST1.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST10

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST11

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 # Copyright 2019, IBM Corporation

src/test/blk_non_zero/TEST12

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 # Copyright 2019, IBM Corporation

src/test/blk_non_zero/TEST13

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 # Copyright 2019, IBM Corporation

src/test/blk_non_zero/TEST14

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 # Copyright 2019, IBM Corporation

src/test/blk_non_zero/TEST15

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 # Copyright 2019, IBM Corporation

src/test/blk_non_zero/TEST2

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST2.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST3

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST3.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST4

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST4.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST5.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST9

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_non_zero/TEST9.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_pool/TEST1

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_pool/TEST1.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_pool/TEST10

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_pool/TEST10.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_pool/TEST11

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_pool/TEST11.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_pool/TEST15w.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

src/test/blk_pool/TEST16.PS1

@@ -1,5 +1,7 @@
 #
+# SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2015-2019, Intel Corporation
+#
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without