diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-30 04:04:58 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-30 04:04:58 -0400 |
| commit | 8a7b5d0f75f757fa88b0d17c19523161b27b8e80 (patch) | |
| tree | 54a3e7f1f995583ed924ff32cf5dacc800119800 /scripts | |
| parent | 7bab01ecc6c43da882333c6db39741cb43677004 (diff) | |
| parent | acb1872577b346bd15ab3a3f8dff780d6cca4b70 (diff) | |
Merge 4.18-rc7 into usb-next
We want the USB fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/tags.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/tags.sh b/scripts/tags.sh index 412a70cce558..26de7d5aa5c8 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh | |||
| @@ -152,6 +152,7 @@ regex_asm=( | |||
| 152 | ) | 152 | ) |
| 153 | regex_c=( | 153 | regex_c=( |
| 154 | '/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/' | 154 | '/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/' |
| 155 | '/^BPF_CALL_[0-9](\([[:alnum:]_]*\).*/\1/' | ||
| 155 | '/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/' | 156 | '/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/' |
| 156 | '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/' | 157 | '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/' |
| 157 | '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/' | 158 | '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/' |