| Message ID | 20210320193708.348503-1-mkl@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 49371a8a66ac2f78afe9101b5836190b8b668fff |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | pull-request: can 2021-03-20 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Series ignored based on subject |
Hello: This pull request was applied to netdev/net.git (refs/heads/master): On Sat, 20 Mar 2021 20:37:06 +0100 you wrote: > Hello Jakub, hello David, > > this is a pull request of 2 patches for net/master. > > The first patch is by Oliver Hartkopp. He fixes the TX-path in the > ISO-TP protocol by properly initializing the outgoing CAN frames. > > [...] Here is the summary with links: - pull-request: can 2021-03-20 https://git.kernel.org/netdev/net/c/49371a8a66ac - [net,2/2] can: peak_usb: Revert "can: peak_usb: add forgotten supported devices" https://git.kernel.org/netdev/net/c/5d7047ed6b72 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Hello Jakub, hello David, this is a pull request of 2 patches for net/master. The first patch is by Oliver Hartkopp. He fixes the TX-path in the ISO-TP protocol by properly initializing the outgoing CAN frames. The second patch is by me and reverts a patch from my previous pull request which added MODULE_SUPPORTED_DEVICE to the peak_usb driver. In the mean time in Linus's tree the entirely MODULE_SUPPORTED_DEVICE was removed. So this reverts the adding of the new MODULE_SUPPORTED_DEVICE to avoid the merge conflict. If you prefer to resolve the merge conflict by hand, I'll send a new pull request without that patch. regards, Marc --- The following changes since commit 5aa3c334a449bab24519c4967f5ac2b3304c8dcf: selftests: forwarding: vxlan_bridge_1d: Fix vxlan ecn decapsulate value (2021-03-19 13:54:28 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-5.12-20210320 for you to fetch changes up to 5d7047ed6b7214fbabc16d8712a822e256b1aa44: can: peak_usb: Revert "can: peak_usb: add forgotten supported devices" (2021-03-20 20:28:45 +0100) ---------------------------------------------------------------- linux-can-fixes-for-5.12-20210320 ---------------------------------------------------------------- Marc Kleine-Budde (1): can: peak_usb: Revert "can: peak_usb: add forgotten supported devices" Oliver Hartkopp (1): can: isotp: tx-path: zero initialize outgoing CAN frames drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 2 -- net/can/isotp.c | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-)