diff options
| author | Jens Axboe <axboe@fb.com> | 2016-12-06 08:06:19 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-12-06 08:06:19 -0700 |
| commit | d65cfe9094ba66b8a3c7b80823ba9229759b119d (patch) | |
| tree | 62d54ca13d8c997934cf37f5698f0793b013c4d1 /include/linux/parser.h | |
| parent | 6e85eaf3078bcc8552ca32a0938dbf7d2b495af0 (diff) | |
| parent | 475d0fe795516a9b9f286a851c3972fd8831c643 (diff) | |
Merge branch 'nvmf-4.10' of git://git.infradead.org/nvme-fabrics into for-4.10/block
Sagi writes:
The major addition here is the nvme FC transport implementation
from James.
What else:
- some cleanups and memory leak fixes in the host side fabrics code from Bart
- possible rcu violation fix from Sasha
- logging change from Max
- small include cleanup
Diffstat (limited to 'include/linux/parser.h')
| -rw-r--r-- | include/linux/parser.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/parser.h b/include/linux/parser.h index 39d5b7955b23..884c1e6eb3fe 100644 --- a/include/linux/parser.h +++ b/include/linux/parser.h @@ -27,6 +27,7 @@ typedef struct { int match_token(char *, const match_table_t table, substring_t args[]); int match_int(substring_t *, int *result); +int match_u64(substring_t *, u64 *result); int match_octal(substring_t *, int *result); int match_hex(substring_t *, int *result); bool match_wildcard(const char *pattern, const char *str); |