Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/h8300/Kconfig
between commit:
a801eb26d124 ("h8300: Add LZO compression")
from the h8300 tree and commit:
97a23beb8db9 ("clocksource/drivers/h8300_timer8: Separate the Kconfig option
from the arch")
fr
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/h8300/Kconfig
between commits:
f639eeb4a60c ("h8300: enable CLKSRC_OF")
a801eb26d124 ("h8300: Add LZO compression")
from the h8300 tree and commit:
6a5c601bf048 ("clocksource/drivers/h8300_timer8: Sepa
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/h8300/Kconfig
between commit:
f639eeb4a60c ("h8300: enable CLKSRC_OF")
from the h8300 tree and commit:
3e1e4573ef65 ("clocksource/drivers/h8300_timer8: Separate the Kconfig option
from the arch")
from
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/h8300/include/asm/io.h
between commit:
a795239b698d ("h8300: bit io fix")
from the h8300 tree and commit:
fcd51e13e368 ("h8300: Rename ctlr_out/in[bwl] to raw_read/write[bwl]")
from the clockevents tree
4 matches
Mail list logo