Messages in this thread |  | | Date | Mon, 21 Dec 2015 14:08:24 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the clockevents tree with the tip tree |
| |
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/h8300_timer16.c
between commit:
d33f250af4e6 ("clocksource/drivers/h8300: Use ioread / iowrite")
from the tip tree and commit:
1ddca16cc5b3 ("clocksource/drivers/h8300: Use ioread / iowrite")
from the clockevents tree.
The former is just a fixed version of the latter, so I used that.
It looks like the clockevents tree needs to be cleaned up.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
|  |