On 04.05.2021 12:58:47, Torin Cooper-Bennun wrote: > On Tue, May 04, 2021 at 01:54:33PM +0200, Marc Kleine-Budde wrote: > > What's the base commit for this series? > > > > regards, > > Marc > > > > -- > > Pengutronix e.K. | Marc Kleine-Budde | > > Embedded Linux | https://www.pengutronix.de | > > Vertretung West/Dortmund | Phone: +49-231-2826-924 | > > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > Effective base is: > > 644022b1de9e - can: m_can: m_can_receive_skb(): add missing error handling to can_rx_offload_queue_sorted() call > > (This series rebases onto can-next/testing without conflicts) 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; | | error: patch failed: drivers/net/can/m_can/m_can.c:449 | Applying patch drivers/net/can/m_can/m_can.c with 1 reject... | Hunk #1 applied cleanly. | Hunk #2 applied cleanly. | Hunk #3 applied cleanly. | Hunk #4 applied cleanly. | Hunk #5 applied cleanly. | Hunk #6 applied cleanly. | Hunk #7 applied cleanly. | Rejected hunk #8. | Hunk #9 applied cleanly. | Hunk #10 applied cleanly. | Hunk #11 applied cleanly. | Hunk #12 applied cleanly. | Hunk #13 applied cleanly. | Hunk #14 applied cleanly. | Hunk #15 applied cleanly. | Hunk #16 applied cleanly. | Hunk #17 applied cleanly. | Hunk #18 applied cleanly. | Hunk #19 applied cleanly. | Hunk #20 applied cleanly. | Hunk #21 applied cleanly. | Hunk #22 applied cleanly. | Patch failed at 0001 can: m_can: use bits.h macros for all regmasks | hint: Use 'git am --show-current-patch=diff' to see the failed patch | When you have resolved this problem, run "git am --continue". | If you prefer to skip this patch, run "git am --skip" instead. | To restore the original branch and stop patching, run "git am --abort". | | ➜ (pts/13) frogger@hardanger:socketcan/linux (next✗) cat drivers/net/can/m_can/m_can.c.rej | diff a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c (rejected hunks) | @@ -449,8 +419,8 @@ static void m_can_clean(struct net_device *net) | | net->stats.tx_errors++; | if (cdev->version > 30) | - putidx = ((m_can_read(cdev, M_CAN_TXFQS) & | - TXFQS_TFQPI_MASK) >> TXFQS_TFQPI_SHIFT); | + putidx = FIELD_GET(TXFQS_TFQPI_MASK, | + m_can_read(cdev, M_CAN_TXFQS)); | | can_free_echo_skb(cdev->net, putidx); | cdev->tx_skb = NULL; regards Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: PGP signature
