Merge "pmem: Fix a possible NULL pointer dereference" into msm-3.0