summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-11-03 10:21:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-11-03 10:21:43 -0700
commitcddfa11aef3c4914f406a059138ccc354f034d1c (patch)
tree388031c740f221576e7bb3f1ad35b0b158280525 /drivers
parent5f21585384a4a69b8bfdd2cae7e3648ae805f57d (diff)
parentdd33ad7b251f900481701b2a82d25de583867708 (diff)
downloadlinux-cddfa11aef3c4914f406a059138ccc354f034d1c.tar.bz2
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton: - more ocfs2 work - various leftovers * emailed patches from Andrew Morton <akpm@linux-foundation.org>: memory_hotplug: cond_resched in __remove_pages bfs: add sanity check at bfs_fill_super() kernel/sysctl.c: remove duplicated include kernel/kexec_file.c: remove some duplicated includes mm, thp: consolidate THP gfp handling into alloc_hugepage_direct_gfpmask ocfs2: fix clusters leak in ocfs2_defrag_extent() ocfs2: dlmglue: clean up timestamp handling ocfs2: don't put and assigning null to bh allocated outside ocfs2: fix a misuse a of brelse after failing ocfs2_check_dir_entry ocfs2: don't use iocb when EIOCBQUEUED returns ocfs2: without quota support, avoid calling quota recovery ocfs2: remove ocfs2_is_o2cb_active() mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappings include/linux/notifier.h: SRCU: fix ctags mm: handle no memcg case in memcg_kmem_charge() properly
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions