From: Pan Xinhui Date: Thu, 10 Dec 2015 07:30:02 +0000 (+0800) Subject: powerpc/nvram: Fix an incorrect partition merge X-Git-Tag: v3.2.85~102 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b4f20c3454920b8305b83b24dbe84390378a5101 powerpc/nvram: Fix an incorrect partition merge commit 11b7e154b132232535befe51c55db048069c8461 upstream. When we merge two contiguous partitions whose signatures are marked NVRAM_SIG_FREE, We need update prev's length and checksum, then write it to nvram, not cur's. So lets fix this mistake now. Also use memset instead of strncpy to set the partition's name. It's more readable if we want to fill up with duplicate chars . Fixes: fa2b4e54d41f ("powerpc/nvram: Improve partition removal") Signed-off-by: Pan Xinhui Signed-off-by: Michael Ellerman Signed-off-by: Ben Hutchings --- Reading git-diff-tree failed