mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 14:52:05 +00:00
7fa8ad6df7
Fix the failing merge in net-next by reverting the last net-next merge for caif_hsi.c and then merge in the commit: "caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost" from the net repository. The commit:"caif-hsi: Add missing return in error path" from net repository was dropped, as it changed code previously removed in the net-next repository. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| caif_hsi.c | ||
| caif_serial.c | ||
| caif_shm_u5500.c | ||
| caif_shmcore.c | ||
| caif_spi_slave.c | ||
| caif_spi.c | ||
| Kconfig | ||
| Makefile | ||