* linux-next: manual merge of the libata tree
@ 2015-12-31 1:29 Stephen Rothwell
2016-01-01 2:01 ` Tejun Heo
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2015-12-31 1:29 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-next, linux-kernel, Jaedon Shin
Hi Tejun,
Today's linux-next merge of the libata tree got conflicts all over teh
place due to commit:
53fab927a8fc ("ata: ahci_brcmstb: add support for MIPS-based platforms")
from the libata tree which seem to contain most (if not all) of Linus'
tree :-(.
I have used the version of the libata tree from next-20151223 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-01 2:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-31 1:29 linux-next: manual merge of the libata tree Stephen Rothwell
2016-01-01 2:01 ` Tejun Heo
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).