diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-07-28 22:22:40 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-07-28 22:22:40 +0200 |
| commit | 7a30bdd99f37352b188575b27924c407c6ddff9e (patch) | |
| tree | 10ea40ab1b5211e75c33eaddb3a6b393ad6ee7ad /arch/arm/tools | |
| parent | f36cf386e3fec258a341d446915862eded3e13d8 (diff) | |
| parent | 609488bc979f99f805f34e9a32c1e3b71179d10b (diff) | |
| download | talos-op-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.gz talos-op-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.zip | |
Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Pick up the spectre documentation so the Grand Schemozzle can be added.
Diffstat (limited to 'arch/arm/tools')
| -rw-r--r-- | arch/arm/tools/mach-types | 2 | ||||
| -rw-r--r-- | arch/arm/tools/syscall.tbl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 4eac94c1eb6f..9e74c7ff6b04 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types @@ -7,7 +7,7 @@ # http://www.arm.linux.org.uk/developer/machines/download.php # # Please do not send patches to this file; it is automatically generated! -# To add an entry into this database, please see Documentation/arm/README, +# To add an entry into this database, please see Documentation/arm/arm.rst, # or visit: # # http://www.arm.linux.org.uk/developer/machines/?action=new diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index aaf479a9e92d..6da7dc4d79cc 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -447,3 +447,5 @@ 431 common fsconfig sys_fsconfig 432 common fsmount sys_fsmount 433 common fspick sys_fspick +434 common pidfd_open sys_pidfd_open +435 common clone3 sys_clone3 |
