Merge remote-tracking branch 'pstore/for-next/pstore'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 00:31:47 +0000 (11:31 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 00:31:47 +0000 (11:31 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 00:31:47 +0000 (11:31 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 00:31:47 +0000 (11:31 +1100)
diff --cc arch/powerpc/kernel/nvram_64.c
Simple merge
diff --cc fs/pstore/inode.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 00:31:47 +0000 (11:31 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 00:31:47 +0000 (11:31 +1100)
		1	2
arch/powerpc/kernel/nvram_64.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/pstore/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history