From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
kernel@pengutronix.de
Subject: pull-request: can 2021-03-20
Date: Sat, 20 Mar 2021 20:37:06 +0100 [thread overview]
Message-ID: <20210320193708.348503-1-mkl@pengutronix.de> (raw)
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(-)
next reply other threads:[~2021-03-20 19:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-20 19:37 Marc Kleine-Budde [this message]
2021-03-20 19:37 ` [net 1/2] can: isotp: tx-path: zero initialize outgoing CAN frames Marc Kleine-Budde
2021-03-20 19:37 ` [net 2/2] can: peak_usb: Revert "can: peak_usb: add forgotten supported devices" Marc Kleine-Budde
2021-03-21 2:10 ` pull-request: can 2021-03-20 patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210320193708.348503-1-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).