lkml.org 
[lkml]   [2014]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: build warning after merge of the clockevents tree
Hi Daniel,

After merging the clockevents tree, the file
drivers/clocksource/clksrc-of.c.rej appears ... it was commited as part
of commit 55af97749f2b ("Merge branch 'clockevents/3.14' of
git://git.linaro.org/people/daniel.lezcano/linux into timers/core") which
I suspect was added to the clockevents tree when you based (or merged)
the tip tree. That commit no longer appears in the tip tree.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-01-16 05:41    [W:0.051 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site