Merge tag 'v4.17-rc2' into docs-next

  Merge -rc2 to pick up the changes to
  Documentation/core-api/kernel-api.rst that hit mainline via the
  networking tree.  In their absence, subsequent patches cannot be
  applied.

diff --cc MAINTAINERS
Simple merge

diff --cc fs/proc/task_mmu.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/rmap.c
Simple merge