| Message ID | 20200312102420.4835-2-oohall@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Dual license skiboot as Apache2 / GPLv2+ | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch master (2700092e09adc8f3c2d578878c1a98cb44b9863d) |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot | success | Test snowpatch/job/snowpatch-skiboot on branch master |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco | success | Signed-off-by present |
diff --git a/hw/phb4.c b/hw/phb4.c index ed7f4e5c4756..f17625bb6407 100644 --- a/hw/phb4.c +++ b/hw/phb4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later /* * PHB4: PCI Host Bridge 4, in POWER9 * diff --git a/include/phb4.h b/include/phb4.h index 3dd0a5cffb21..6d5fd5103515 100644 --- a/include/phb4.h +++ b/include/phb4.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later /* Copyright 2013-2019 IBM Corp. */ #ifndef __PHB4_H diff --git a/include/platform.h b/include/platform.h index 671878b929a5..6aa263ae0cdd 100644 --- a/include/platform.h +++ b/include/platform.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later /* Copyright 2013-2019 IBM Corp. */ #ifndef __PLATFORM_H diff --git a/platforms/astbmc/romulus.c b/platforms/astbmc/romulus.c index 2f3a0a44b882..9afb7d3deb47 100644 --- a/platforms/astbmc/romulus.c +++ b/platforms/astbmc/romulus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later /* Copyright 2017-2019 IBM Corp. */ #include <skiboot.h> diff --git a/platforms/astbmc/talos.c b/platforms/astbmc/talos.c index 55a33859bc54..a5a37d3421bf 100644 --- a/platforms/astbmc/talos.c +++ b/platforms/astbmc/talos.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later /* * Copyright 2017-2019 IBM Corp. * Copyright 2018-2019 Raptor Engineering, LLC
The following files contain contributions from Timothy Pearson at Raptor Computer Systems. He has agreed to re-license these contributions as Dual Apache 2.0 / GPLv2+, so amend the SPDX tag to reflect that. hw/phb4.c include/phb4.h include/platform.h platforms/astbmc/talos.c platforms/astbmc/romulus.c Cc: Timothy Pearson <tpearson@raptorengineering.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- hw/phb4.c | 2 +- include/phb4.h | 2 +- include/platform.h | 2 +- platforms/astbmc/romulus.c | 2 +- platforms/astbmc/talos.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)