From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Mar 2019 22:10:10 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f261c4e529dac5608a604d3dd3ae1cd2adf23c89;p=linux.git

Merge branch 'akpm' (patches from Andrew)

Merge misc patches from Andrew Morton:

- a little bit more MM

- a few fixups

[ The "little bit more MM" is actually just one of the three patches
  Andrew sent for mm/filemap.c, I'm still mulling over two more of them
  from Josef Bacik     - Linus ]

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  include/linux/swap.h: use offsetof() instead of custom __swapoffset macro
  tools/testing/selftests/proc/proc-pid-vm.c: test with vsyscall in mind
  zram: default to lzo-rle instead of lzo
  filemap: pass vm_fault to the mmap ra helpers
---

f261c4e529dac5608a604d3dd3ae1cd2adf23c89