Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1295752 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-12-21 04:10 +0100 |
| Last post | 2015-12-21 04:10 +0100 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the clockevents tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-21 04:10 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-12-21 04:10 +0100 |
| Subject | linux-next: manual merge of the clockevents tree with the tip tree |
| Message-ID | <qHZ1f-Uv-1@gated-at.bofh.it> |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to top | Article view | linux.kernel
csiph-web