linux-next: manual merge of the ptr-ret tree with the staging tree

[Stephen Rothwell]

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                    s...@canb.auug.org.au

pgpHf2yJ16jiM.pgp
Description: PGP signature