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