From 1022c4589ce28d0db3e4ecdb6fb996311d661154 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Mon, 2 Dec 2024 19:28:21 -0500 Subject: [PATCH] drm-uapi: update licenses statement Replace deprecated GPL-1.0+ with clear GPL-1.0-or-later. Cc: mesa-stable Signed-off-by: David Heidelberg (cherry picked from commit 5774f2c66e116392db9dbe3a1c92b7051993d02c) Part-of: --- .pick_status.json | 2 +- include/drm-uapi/sync_file.h | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ecd74f18a05..87bea112dd0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1984,7 +1984,7 @@ "description": "drm-uapi: update licenses statement", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/include/drm-uapi/sync_file.h b/include/drm-uapi/sync_file.h index 7ede34e12de..e318ac273a2 100644 --- a/include/drm-uapi/sync_file.h +++ b/include/drm-uapi/sync_file.h @@ -1,12 +1,6 @@ -/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */ /* - * Copyright (C) 2012 Google, Inc. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * SPDX-License-Identifier: GPL-1.0-or-later WITH Linux-syscall-note + * Copyright 2012 Google, Inc. */ #ifndef _UAPI_LINUX_SYNC_H