diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 10:51:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 10:51:26 -0700 |
| commit | 8837c70d531a1788f975c366c254a5cb973a5291 (patch) | |
| tree | f7a719d01090efb3bc534f5b0d7f13ec87eecadb /MAINTAINERS | |
| parent | b284d4d5a6785f8cd07eda2646a95782373cd01e (diff) | |
| parent | b93b016313b3ba8003c3b8bb71f569af91f19fc7 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton:
- almost all of the rest of MM
- kasan updates
- lots of procfs work
- misc things
- lib/ updates
- checkpatch
- rapidio
- ipc/shm updates
- the start of willy's XArray conversion
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (140 commits)
page cache: use xa_lock
xarray: add the xa_lock to the radix_tree_root
fscache: use appropriate radix tree accessors
export __set_page_dirty
unicore32: turn flush_dcache_mmap_lock into a no-op
arm64: turn flush_dcache_mmap_lock into a no-op
mac80211_hwsim: use DEFINE_IDA
radix tree: use GFP_ZONEMASK bits of gfp_t for flags
linux/const.h: refactor _BITUL and _BITULL a bit
linux/const.h: move UL() macro to include/linux/const.h
linux/const.h: prefix include guard of uapi/linux/const.h with _UAPI
xen, mm: allow deferred page initialization for xen pv domains
elf: enforce MAP_FIXED on overlaying elf segments
fs, elf: drop MAP_FIXED usage from elf_map
mm: introduce MAP_FIXED_NOREPLACE
MAINTAINERS: update bouncing aacraid@adaptec.com addresses
fs/dcache.c: add cond_resched() in shrink_dentry_list()
include/linux/kfifo.h: fix comment
ipc/shm.c: shm_split(): remove unneeded test for NULL shm_file_data.vm_ops
kernel/sysctl.c: add kdoc comments to do_proc_do{u}intvec_minmax_conv_param
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7bb2e9595f14..c7182d2a9f5c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4392,7 +4392,7 @@ S: Maintained F: drivers/staging/fsl-dpaa2/ethsw DPT_I2O SCSI RAID DRIVER -M: Adaptec OEM Raid Solutions <aacraid@adaptec.com> +M: Adaptec OEM Raid Solutions <aacraid@microsemi.com> L: linux-scsi@vger.kernel.org W: http://www.adaptec.com/ S: Maintained @@ -6410,6 +6410,7 @@ L: linux-mm@kvack.org S: Maintained F: mm/hmm* F: include/linux/hmm* +F: Documentation/vm/hmm.txt HOST AP DRIVER M: Jouni Malinen <j@w1.fi> @@ -7344,7 +7345,7 @@ F: include/linux/ipmi* F: include/uapi/linux/ipmi* IPS SCSI RAID DRIVER -M: Adaptec OEM Raid Solutions <aacraid@adaptec.com> +M: Adaptec OEM Raid Solutions <aacraid@microsemi.com> L: linux-scsi@vger.kernel.org W: http://www.adaptec.com/ S: Maintained @@ -11762,7 +11763,7 @@ F: drivers/char/random.c RAPIDIO SUBSYSTEM M: Matt Porter <mporter@kernel.crashing.org> -M: Alexandre Bounine <alexandre.bounine@idt.com> +M: Alexandre Bounine <alex.bou9@gmail.com> S: Maintained F: drivers/rapidio/ |