linux-kernel - linux-next: manual merge of the ptr-ret tree with the staging 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>] [day] [month] [year] [list]

Message-Id: <20130813171031.d365f152275f5736803f4413@canb.auug.org.au>
Date:	Tue, 13 Aug 2013 17:10:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the ptr-ret tree with the staging tree

Hi Rusty,

Today's linux-next merge of the ptr-ret tree got a conflict in
drivers/staging/zcache/zcache-main.c between commit 962564604873
("staging: zcache: delete it") from the staging tree and commit
8a1d41cfeaf5 ("staging/zcache: don't use PTR_RET()") from the ptr-ret
tree.

I fixed it up (the former removes the file, so I did that) and can carry
the fix as necessary (no action is required).

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

Content of type "application/pgp-signature" skipped