* linux-next: manual merge of the akpm-current tree
@ 2015-04-20 5:36 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-04-20 5:36 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got many conflicts in
many files (presumably because most of this has been merged upstream).
I just dropped the akpm-current tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-20 5:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-20 5:36 linux-next: manual merge of the akpm-current 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).