diff options
author | Dave Airlie <airlied@redhat.com> | 2020-09-08 14:41:40 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-09-08 14:41:40 +1000 |
commit | ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf (patch) | |
tree | 3a54614d597b7b92ada36c5ea26dc994216b628b /lib/glob.c | |
parent | 3393649977f9a8847c659e282ea290d4b703295c (diff) | |
parent | f4d51dffc6c01a9e94650d95ce0104964f8ae822 (diff) | |
download | linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.tar.gz linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.tar.bz2 linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.zip |
Merge tag 'v5.9-rc4' into drm-next
Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'lib/glob.c')
-rw-r--r-- | lib/glob.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/glob.c b/lib/glob.c index 0ba3ea86b546..52e3ed7e4a9b 100644 --- a/lib/glob.c +++ b/lib/glob.c @@ -102,7 +102,7 @@ bool __pure glob_match(char const *pat, char const *str) break; case '\\': d = *pat++; - /*FALLTHROUGH*/ + /* fall through */ default: /* Literal character */ literal: if (c == d) { |