Message ID | 20200316012740.28342-2-oohall@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/2] Re-license contributions from Dan Horák | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch master (e19dddc58280e6120459053dfcbf9c026b0ac4f9) |
snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
diff --git a/core/pcie-slot.c b/core/pcie-slot.c index 894fd40513c3..03326e58f9c2 100644 --- a/core/pcie-slot.c +++ b/core/pcie-slot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later /* * PCIe Slots * diff --git a/platforms/astbmc/nicole.c b/platforms/astbmc/nicole.c index cc71924bfe24..f21d0361aa13 100644 --- a/platforms/astbmc/nicole.c +++ b/platforms/astbmc/nicole.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later /* * Copyright (c) 2019 YADRO */ diff --git a/platforms/astbmc/vesnin.c b/platforms/astbmc/vesnin.c index b1d909e29bcb..f7e1844fc84c 100644 --- a/platforms/astbmc/vesnin.c +++ b/platforms/astbmc/vesnin.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later /* * Copyright (c) 2018 YADRO * Copyright 2018-2019 IBM Corp.
Cc: Ilya Kuznetsov <ilya@yadro.com> Cc: Artem Senichev <artemsen@gmail.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- core/pcie-slot.c | 2 +- platforms/astbmc/nicole.c | 2 +- platforms/astbmc/vesnin.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)