Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/mti-malta/malta-memory.c between commit 2ff89d64f23e ("MIPS:
malta: memory.c: Initialize the 'memsize' variable") from Linus' tree
and commit acd8bc1a70ff ("MIPS: malta: Remove 'maybe_unused' attribute
from ememsize{, _str}") from the mips tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/mips/mti-malta/malta-memory.c
index f2364e419682,1ca34887d990..000000000000
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@@ -26,8 -26,8 +26,8 @@@ unsigned long physical_memsize = 0L
  
  fw_memblock_t * __init fw_getmdesc(int eva)
  {
- 	char *memsize_str, *ememsize_str __maybe_unused = NULL, *ptr;
- 	unsigned long memsize = 0, ememsize __maybe_unused = 0;
+ 	char *memsize_str, *ememsize_str = NULL, *ptr;
 -	unsigned long memsize, ememsize = 0;
++	unsigned long memsize = 0, ememsize = 0;
  	static char cmdline[COMMAND_LINE_SIZE] __initdata;
  	int tmp;