| Message ID | 20241104200120.393312-2-mkl@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b6ec62e01aa4229bc9d3861d1073806767ea7838 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,1/8] can: j1939: fix error in J1939 documentation. | expand |
Hello: This series was applied to netdev/net.git (main) by Marc Kleine-Budde <mkl@pengutronix.de>: On Mon, 4 Nov 2024 20:53:24 +0100 you wrote: > From: Alexander Hölzl <alexander.hoelzl@gmx.net> > > The description of PDU1 format usage mistakenly referred to PDU2 format. > > Signed-off-by: Alexander Hölzl <alexander.hoelzl@gmx.net> > Acked-by: Oleksij Rempel <o.rempel@pengutronix.de> > Acked-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr> > Link: https://patch.msgid.link/20241023145257.82709-1-alexander.hoelzl@gmx.net > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > > [...] Here is the summary with links: - [net,1/8] can: j1939: fix error in J1939 documentation. https://git.kernel.org/netdev/net/c/b6ec62e01aa4 - [net,2/8] can: {cc770,sja1000}_isa: allow building on x86_64 https://git.kernel.org/netdev/net/c/7b22846f8af5 - [net,3/8] can: m_can: m_can_close(): don't call free_irq() for IRQ-less devices https://git.kernel.org/netdev/net/c/e4de81f9e134 - [net,4/8] can: c_can: fix {rx,tx}_errors statistics https://git.kernel.org/netdev/net/c/4d6d26537940 - [net,5/8] can: rockchip_canfd: CAN_ROCKCHIP_CANFD should depend on ARCH_ROCKCHIP https://git.kernel.org/netdev/net/c/4384b8b6ec46 - [net,6/8] can: rockchip_canfd: Drop obsolete dependency on COMPILE_TEST https://git.kernel.org/netdev/net/c/51e102ec23b2 - [net,7/8] can: mcp251xfd: mcp251xfd_ring_alloc(): fix coalescing configuration when switching CAN modes https://git.kernel.org/netdev/net/c/eb9a839b3d8a - [net,8/8] can: mcp251xfd: mcp251xfd_get_tef_len(): fix length calculation https://git.kernel.org/netdev/net/c/3c1c18551e6a You are awesome, thank you!
diff --git a/Documentation/networking/j1939.rst b/Documentation/networking/j1939.rst index e4bd7aa1f5aa..544bad175aae 100644 --- a/Documentation/networking/j1939.rst +++ b/Documentation/networking/j1939.rst @@ -121,7 +121,7 @@ format, the Group Extension is set in the PS-field. On the other hand, when using PDU1 format, the PS-field contains a so-called Destination Address, which is _not_ part of the PGN. When communicating a PGN -from user space to kernel (or vice versa) and PDU2 format is used, the PS-field +from user space to kernel (or vice versa) and PDU1 format is used, the PS-field of the PGN shall be set to zero. The Destination Address shall be set elsewhere.