diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-25 12:45:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-25 12:45:31 -0700 |
| commit | 73f3af7b4611d77bdaea303fb639333eb28e37d7 (patch) | |
| tree | 2ad53a2afcfb372f0b9e47724b2eeb8138d4a458 | |
| parent | fe67f4dd8daa252eb9aa7acb61555f3cc3c1ce4c (diff) | |
| parent | a34cc13add2c92573db79192967f6a512868ec56 (diff) | |
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
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | mm/memory_hotplug.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c6b8a720c0bc..d7b4f32875a9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 8cb75b26ea4f..86c3af79e874 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1731,6 +1731,7 @@ failed_removal_isolated: 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", |