Commit 73f3af7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "2 patches.

  Subsystems affected by this patch series: mm/memory-hotplug and
  MAINTAINERS"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  MAINTAINERS: exfat: update my email address
  mm/memory_hotplug: fix potential permanent lru cache disable
parents fe67f4dd a34cc13a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6955,7 +6955,7 @@ F: include/uapi/linux/mdio.h 
F:	include/uapi/linux/mii.h









EXFAT FILE SYSTEM









M:	Namjae Jeon <namjae.jeon@samsung.com>









M:	Namjae Jeon <linkinjeon@kernel.org>









M:	Sungjong Seo <sj1557.seo@samsung.com>









L:	linux-fsdevel@vger.kernel.org









S:	Maintained
































mm/memory_hotplug.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -1731,6 +1731,7 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages)







	undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE);









	memory_notify(MEM_CANCEL_OFFLINE, &arg);









failed_removal_pcplists_disabled:









	lru_cache_enable();









	zone_pcp_enable(zone);









failed_removal:









	pr_debug("memory offlining [mem %#010llx-%#010llx] failed due to %s\n",