Hi, This fix is reasonable to me. Thanks, Seiji > -----Original Message----- > From: Stephen Rothwell [mailto:sfr@xxxxxxxxxxxxxxxx] > Sent: Sunday, November 25, 2012 7:32 PM > To: Luck, Tony > Cc: linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; Colin Ian King; Anton Vorontsov; Seiji Aguchi > Subject: linux-next: manual merge of the ia64 tree with Linus' tree > > Hi all, > > Today's linux-next merge of the ia64 tree got a conflict in fs/pstore/platform.c between commit 70a6f46d7b0e ("pstore: Fix NULL > pointer dereference in console writes") from Linus' tree and commit > faa338315985 ("efi_pstore: Add a sequence counter to a variable name") from the ia64 tree. > > I fixed it up (see below) and can carry the fix as necessary. > -- > Cheers, > Stephen Rothwell sfr@xxxxxxxxxxxxxxxx > > diff --cc fs/pstore/platform.c > index 947fbe0,e518f43..0000000 > --- a/fs/pstore/platform.c > +++ b/fs/pstore/platform.c > @@@ -173,7 -172,7 +173,7 @@@ static void pstore_console_write(struc > spin_lock_irqsave(&psinfo->buf_lock, flags); > } > memcpy(psinfo->buf, s, c); > - psinfo->write(PSTORE_TYPE_CONSOLE, 0, &id, 0, c, psinfo); > - psinfo->write(PSTORE_TYPE_CONSOLE, 0, NULL, 0, 0, c, psinfo); > ++ psinfo->write(PSTORE_TYPE_CONSOLE, 0, &id, 0, 0, c, psinfo); > spin_unlock_irqrestore(&psinfo->buf_lock, flags); > s += c; > c = e - s; -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
