![]() Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between |
||
---|---|---|
.. | ||
core.c | ||
hidp.h | ||
Kconfig | ||
Makefile | ||
sock.c |
![]() Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between |
||
---|---|---|
.. | ||
core.c | ||
hidp.h | ||
Kconfig | ||
Makefile | ||
sock.c |