Hi all,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/timer-tegra.c
between commit:
9c92ab619141 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
282")
from Linus' tree and commit:
75e9f7c6dca8 ("clocksource/drivers/tegra: Use
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/arm_arch_timer.c
between commit:
d9b5e41591ca ("clocksource: arm_arch_timer: Extend arch_timer_kvm_info to get
the virtual IRQ")
from Linus' tree and commit:
e6f3cf51efde
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/arm_arch_timer.c
between commit:
d9b5e41591ca ("clocksource: arm_arch_timer: Extend arch_timer_kvm_info to get
the virtual IRQ")
from Linus' tree and commit:
e6f3cf51efde
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/Kconfig
between commit:
863ee050726b ("clocksource/drivers: Fix dependencies for !HAS_IOMEM archs")
from Linus' tree and commit:
0219c41c9e0a ("clocksource/drivers/lpc32xx: Support
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/Kconfig
between commit:
863ee050726b ("clocksource/drivers: Fix dependencies for !HAS_IOMEM archs")
from Linus' tree and commit:
0219c41c9e0a ("clocksource/drivers/lpc32xx: Support
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in
drivers/clocksource/clksrc-of.c between commit 4c4b053235fa
("clocksource: clksrc-of: Do not drop unheld reference on device node")
from Linus' tree and commit fdca679d87bb ("clocksource: clksrc-of: Warn
if no clock
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in
drivers/clocksource/clksrc-of.c between commit 4c4b053235fa
(clocksource: clksrc-of: Do not drop unheld reference on device node)
from Linus' tree and commit fdca679d87bb (clocksource: clksrc-of: Warn
if no clock
7 matches
Mail list logo