On 27.04.2022 16:02:37, Erin MacNeil wrote: > Adding a new socket option, SO_RCVMARK, to indicate that SO_MARK > should be included in the ancillary data returned by recvmsg(). > > Renamed the sock_recv_ts_and_drops() function to sock_recv_cmsgs(). > > Signed-off-by: Erin MacNeil > --- > net/can/bcm.c | 2 +- > net/can/j1939/socket.c | 2 +- > net/can/raw.c | 2 +- For the net/can changes: Acked-by: Marc Kleine-Budde 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 |