Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/rtc/rtc-tegra.c between commit 9889589ba308 ("Drivers: rtc:
remove __dev* attributes") from the driver-core.current tree and commit
"drivers/rtc/rtc-tegra.c: convert to DT driver" from the akpm tree.
I fixed it up (see
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
kernel/printk.c between commit 5becfb1df5ac ("kmsg: merge continuation
records while printing") from the driver-core.current tree and commit
"printk: only look for prefix levels in kernel messages" from the akpm
tree.
I fixed
2 matches
Mail list logo