On Tue, May 04, 2021 at 02:20:17PM +0200, Marc Kleine-Budde wrote: > Hmmm...not here: > > | ➜ (pts/13) frogger@hardanger:socketcan/linux (next✗) git lg -1 > | 644022b1de9e (HEAD -> next) can: m_can: m_can_receive_skb(): add missing error handling to can_rx_offload_queue_sorted() call > | > | ➜ (pts/13) frogger@hardanger:socketcan/linux (next) git am -s --reject ./20210504_torin_can_m_can_various_regmask_related_cleanup.mbx > | Applying: can: m_can: use bits.h macros for all regmasks > | Checking patch drivers/net/can/m_can/m_can.c... > | error: while searching for: > | > | net->stats.tx_errors++; > | if (cdev->version > 30) > | putidx = ((m_can_read(cdev, M_CAN_TXFQS) & > | TXFQS_TFQPI_MASK) >> TXFQS_TFQPI_SHIFT); > | > | can_free_echo_skb(cdev->net, putidx); > | cdev->tx_skb = NULL; > | Yup, found my mistake, my tree is not consistent with can-next. Let me submit a v2. They'll be based directly on can-next/testing. -- Regards, Torin Cooper-Bennun Software Engineer | maxiluxsystems.com
