* linux-next: manual merge of the ptr-ret tree with the staging tree
@ 2013-08-13 7:10 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-08-13 7:10 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, linux-kernel, Greg KH
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-08-13 7:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-13 7:10 linux-next: manual merge of the ptr-ret tree with the staging tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).