diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-03-24 21:58:58 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-03-24 21:58:58 +0800 |
| commit | 2e6d603e5163e6f32a8686744b4d53e8778957ba (patch) | |
| tree | ead238ea5efe7b3f52728793fe9dfa76ca52bc31 /arch/arm/tools | |
| parent | 28845b079b9611b3082aa53e2dae2ea10a16a1c2 (diff) | |
| parent | 97da3854c526d3a6ee05c849c96e48d21527606c (diff) | |
| download | linux-2e6d603e5163e6f32a8686744b4d53e8778957ba.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merging 4.11-rc3 to pick up md5 removal from /dev/random.
Diffstat (limited to 'arch/arm/tools')
| -rw-r--r-- | arch/arm/tools/syscall.tbl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index 3c2cb5d5adfa..0bb0e9c6376c 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -411,3 +411,4 @@ 394 common pkey_mprotect sys_pkey_mprotect 395 common pkey_alloc sys_pkey_alloc 396 common pkey_free sys_pkey_free +397 common statx sys_statx |