diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-29 08:30:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-29 08:30:04 +0200 |
| commit | 2a0f4f16d20127ae0c3f0a3f0190dbbb4d286ba7 (patch) | |
| tree | 60ad34da8aa2a054d8b562cbac9d06d37c52d5cc /include/uapi/linux/rxrpc.h | |
| parent | 6389a62ff798e781567645c0b0ca3dd7b8a4289d (diff) | |
| parent | 609488bc979f99f805f34e9a32c1e3b71179d10b (diff) | |
| download | lwn-2a0f4f16d20127ae0c3f0a3f0190dbbb4d286ba7.tar.gz lwn-2a0f4f16d20127ae0c3f0a3f0190dbbb4d286ba7.zip | |
Merge 5.3-rc2 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux/rxrpc.h')
| -rw-r--r-- | include/uapi/linux/rxrpc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/rxrpc.h b/include/uapi/linux/rxrpc.h index 782069dcf607..4accfa7e266d 100644 --- a/include/uapi/linux/rxrpc.h +++ b/include/uapi/linux/rxrpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */ /* Types and definitions for AF_RXRPC. * * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. |