Messages in this thread | | | Date | Thu, 16 Jan 2014 15:03:41 +1100 | From | Stephen Rothwell <> | Subject | linux-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] | |