Commit ad28fd1c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spdx-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx 

Pull SPDX fixes from Greg KH:
 "Here are some small SPDX fixes for 5.3-rc2 for things that came in
  during the 5.3-rc1 merge window that we previously missed.

  Only three small patches here:

   - two uapi patches to resolve some SPDX tags that were not correct

   - fix an invalid SPDX tag in the iomap Makefile file

  All have been properly reviewed on the public mailing lists"

* tag 'spdx-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx:
  iomap: fix Invalid License ID
  treewide: remove SPDX "WITH Linux-syscall-note" from kernel-space headers again
  treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers
parents 29af915c 0ce38c5f

arch/arm64/include/uapi/asm/bpf_perf_event.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__

#define _UAPI__ASM_BPF_PERF_EVENT_H__

arch/csky/include/uapi/asm/byteorder.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.



#ifndef __ASM_CSKY_BYTEORDER_H

arch/csky/include/uapi/asm/cachectl.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */



#ifndef __ASM_CSKY_CACHECTL_H

#define __ASM_CSKY_CACHECTL_H

arch/csky/include/uapi/asm/perf_regs.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.



#ifndef _ASM_CSKY_PERF_REGS_H

arch/csky/include/uapi/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.



#ifndef _CSKY_PTRACE_H

CRA Git | Maintained and supported by SUSTech CRA and CCSE