lkml.org 
[lkml]   [2015]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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


\
 
 \ /
  Last update: 2015-12-21 04:21    [W:0.022 / U:0.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site