Merge "staging: zsmalloc: Rename page_mapcount_reset"