diff options
| author | Ingo Molnar | 2018-03-27 08:43:39 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2018-03-27 08:43:39 +0200 |
| commit | 0bc91d4ba77156ae9217d25ed7c434540f950d05 (patch) | |
| tree | 949c1acf27b106184d8842586740fbbcc9c9ea62 /mm/sparse.c | |
| parent | x86/mm: Remove pointless checks in vmalloc_fault (diff) | |
| parent | Linux 4.16-rc7 (diff) | |
| download | kernel-qcow2-linux-0bc91d4ba77156ae9217d25ed7c434540f950d05.tar.gz kernel-qcow2-linux-0bc91d4ba77156ae9217d25ed7c434540f950d05.tar.xz kernel-qcow2-linux-0bc91d4ba77156ae9217d25ed7c434540f950d05.zip | |
Merge tag 'v4.16-rc7' into x86/mm, to fix up conflict
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/sparse.c')
0 files changed, 0 insertions, 0 deletions