linux-kernel - linux-next: manual merge of the ia64 tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 26 Nov 2012 11:31:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Luck, Tony" <tony.luck@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Colin Ian King <colin.king@...onical.com>,
	Anton Vorontsov <anton.vorontsov@...aro.org>,
	Seiji Aguchi <seiji.aguchi@....com>
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@...b.auug.org.au

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;

Content of type "application/pgp-signature" skipped