diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-13 19:20:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-13 19:20:02 +0200 |
| commit | ec059019b7e6ae3926a8e1dec02a62d64dd8c060 (patch) | |
| tree | ab60e0f2d21154dda05f58af310a66c94179d70a /fs/ubifs/xattr.c | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | um: Add missing NR_CPUS include (diff) | |
| download | linux-ec059019b7e6ae3926a8e1dec02a62d64dd8c060.tar.xz linux-ec059019b7e6ae3926a8e1dec02a62d64dd8c060.zip | |
Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger:
"No new stuff, just fixes"
* 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Add missing NR_CPUS include
um: Fix to call read_initrd after init_bootmem
um: Include kbuild.h instead of duplicating its macros
um: Fix PTRACE_POKEUSER on x86_64
um: Set number of CPUs
um: Fix _print_addr()
Diffstat (limited to 'fs/ubifs/xattr.c')
0 files changed, 0 insertions, 0 deletions