From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ralf Baechle <ralf@linux-mips•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Markos Chandras <markos.chandras@imgtec•com>
Subject: linux-next: manual merge of the mips tree with Linus' tree
Date: Tue, 3 Jun 2014 10:50:40 +1000 [thread overview]
Message-ID: <20140603105040.4fa16742@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1130 bytes --]
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;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-06-03 0:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-03 0:50 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-25 0:05 linux-next: manual merge of the mips tree with Linus' tree Stephen Rothwell
2019-09-18 11:33 Mark Brown
2019-08-11 23:19 Stephen Rothwell
2019-08-07 0:25 Stephen Rothwell
2019-08-07 7:42 ` Arnd Bergmann
2019-05-12 23:47 Stephen Rothwell
2018-08-23 22:37 Stephen Rothwell
2017-07-11 0:04 Stephen Rothwell
2017-01-03 0:26 Stephen Rothwell
2016-01-24 22:25 Stephen Rothwell
2016-01-25 7:42 ` Ralf Baechle
2015-10-01 1:13 Stephen Rothwell
2015-02-22 0:22 Stephen Rothwell
2015-02-22 0:15 Stephen Rothwell
2015-02-13 0:11 Stephen Rothwell
2015-02-13 10:28 ` Ralf Baechle
2012-10-04 0:35 Stephen Rothwell
2012-10-01 3:58 Stephen Rothwell
2011-11-07 0:04 Stephen Rothwell
2011-11-07 0:04 Stephen Rothwell
2011-11-07 10:18 ` Ralf Baechle
2009-12-14 23:20 Stephen Rothwell
2009-12-15 7:26 ` Michal Simek
2009-12-15 19:27 ` Ralf Baechle
2009-08-18 8:23 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140603105040.4fa16742@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=markos.chandras@imgtec$(echo .)com \
--cc=ralf@linux-mips$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox