diff options

author	Linus Torvalds <torvalds@linux-foundation.org>	2017-01-24 16:54:39 -0800
committer	Linus Torvalds <torvalds@linux-foundation.org>	2017-01-24 16:54:39 -0800
commit	883af14e67e8b8702b5560aa64c888c0cd0bd66c (patch)
tree	74e3a6b53f5fad9f7848ab1b9f6921b7012940a4 /fs/9p/fid.c
parent	0263d4ebd94b36280608e296cba39b924b6e832b (diff)
parent	aab45453ff5c77200c6da4ac909f7a4392aed17e (diff)

Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton: "26 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (26 commits) MAINTAINERS: add Dan Streetman to zbud maintainers MAINTAINERS: add Dan Streetman to zswap maintainers mm: do not export ioremap_page_range symbol for external module mn10300: fix build error of missing fpu_save() romfs: use different way to generate fsid for BLOCK or MTD frv: add missing atomic64 operations mm, page_alloc: fix premature OOM when racing with cpuset mems update mm, page_alloc: move cpuset seqcount checking to slowpath mm, page_alloc: fix fast-path race with cpuset update or removal mm, page_alloc: fix check for NULL preferred_zone kernel/panic.c: add missing \n fbdev: color map copying bounds checking frv: add atomic64_add_unless() mm/mempolicy.c: do not put mempolicy before using its nodemask radix-tree: fix private list warnings Documentation/filesystems/proc.txt: add VmPin mm, memcg: do not retry precharge charges proc: add a schedule point in proc_pid_readdir() mm: alloc_contig: re-allow CMA to compact FS pages mm/slub.c: trace free objects at KERN_INFO ...

Diffstat (limited to 'fs/9p/fid.c')


context:
space:
mode: