Skip to content

Commit

Permalink
Merge pull request #16 from grom72/grom72/LICENSE
Browse files Browse the repository at this point in the history
GitHub smart test
  • Loading branch information
grom72 authored Sep 20, 2024
2 parents 9ef3c3e + b623f29 commit b570c12
Show file tree
Hide file tree
Showing 11 changed files with 486 additions and 35 deletions.
10 changes: 7 additions & 3 deletions CODING_STYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@ Otherwise, just use `unsigned`, `long`, etc.
- Make sure you have the right to submit your contribution under the BSD license,
especially if it is based upon previous work.
See [CONTRIBUTING.md](https://github.com/pmem/pmdk/blob/master/CONTRIBUTING.md) for details.
- A copy of the [BSD-style License](https://github.com/pmem/pmdk/blob/master/LICENSE)
must be placed at the beginning of each source file, script or man page
(Obviously, it does not apply to README's, Visual Studio projects and \*.match files.)
- A copy of the SPDX BSD-3-Clause license reference must be placed at the beginning of each
source file, script or man page. (Obviously, it does not apply to README's, Visual Studio projects
and \*.match files.)
```
/* SPDX-License-Identifier: BSD-3-Clause */
/* Copyright <year>, <Name/Company name> */
```
- When adding a new file to the repo, or when making a contribution to an existing
file, feel free to put your copyright string on top of it.

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ or just begin a dialog about the Persistent Memory Development Kit:

**NOTE: If you do decide to implement code changes and contribute them,
please make sure you agree your contribution can be made available
under the [BSD-style License used for the Persistent Memory Development Kit](https://github.com/pmem/pmdk/blob/master/LICENSE).**
under the [BSD-style License used for the Persistent Memory Development Kit](https://github.com/pmem/pmdk/blob/master/LICENSE.txt).**

**NOTE: Submitting your changes also means that you certify the following:**

Expand Down
41 changes: 41 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
Copyright 2014-2024, Intel Corporation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Everything in this source tree is covered by the previous license
with the following exceptions:

* src/core/valgrind/valgrind.h, src/core/valgrind/memcheck.h,
src/core/valgrind/helgrind.h, src/core/valgrind/drd.h are covered by
BSD-style license variants, contained in those files.

* utils/cstyle (used only during development) are covered by the
Common Development and Distribution License, described in the CDDL HEADER
contained in this file.

31 changes: 31 additions & 0 deletions LICENSE/BSD-3-Clause
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
BSD 3-Clause "New" or "Revised" License

Copyright 2014-2024, Intel Corporation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
14 changes: 3 additions & 11 deletions LICENSE → LICENSE/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
SPDX-License-Identifier: BSD-3-Clause
Copyright 2014-2020, Intel Corporation
BSD 3-Clause "New" or "Revised" License

Copyright 2014-2024, Intel Corporation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -28,12 +29,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Everything in this source tree is covered by the previous license
with the following exceptions:

* src/core/valgrind/valgrind.h, src/core/valgrind/memcheck.h,
src/core/valgrind/helgrind.h, src/core/valgrind/drd.h are covered by
another similar BSD license variant, contained in those files.

* utils/cstyle (used only during development) licensed under CDDL.
Loading

0 comments on commit b570c12

Please sign in to comment.