Merge the SocketCAN branch onto master. I don't think any further
review or checks are required (but ARE certainly welcome). All of the
PRs used to create the SocketCAN branch were previously reviewed and
the merge is very low risk since it should, in principle, effect only
the SocketCAN network sockets and a few CAN drivers.
Looking at the files modified, I think some review will be necessary.
There are several files modified that are not strictly related to
SocketCAN or s32k1xx. This is all files modified by the changes on the
branch:
$ git diff master..SocketCAN --name-only
arch/arm/src/s32k1xx/Kconfig
arch/arm/src/s32k1xx/Make.defs
arch/arm/src/s32k1xx/hardware/s32k1xx_flexcan.h
arch/arm/src/s32k1xx/s32k1xx_flexcan.c
arch/arm/src/s32k1xx/s32k1xx_flexcan.h
arch/arm/src/s32k1xx/s32k1xx_rtc.c
arch/arm/src/s32k1xx/s32k1xx_rtc.h
boards/arm/s32k1xx/s32k148evb/src/s32k1xx_clockconfig.c
*fs/vfs/fs_write.c*
include/netpacket/can.h
*include/nuttx/can.h*
include/nuttx/can/error.h
*include/nuttx/mm/iob.h
*include/nuttx/net/can.h
*include/nuttx/net/net.h
include/nuttx/wqueue.h
include/sys/socket.h
libs/libc/net/lib_recvmsg.c
libs/libc/net/lib_sendmsg.c
net/Kconfig
net/Makefile
net/bluetooth/bluetooth_sockif.c
*net/can/Kconfig
net/can/Make.defs
net/can/can.h
net/can/can_callback.c
net/can/can_conn.c
net/can/can_getsockopt.c
net/can/can_input.c
net/can/can_notifier.c
net/can/can_poll.c
net/can/can_recvfrom.c
net/can/can_send.c
net/can/can_setsockopt.c
net/can/can_sockif.c
*net/devif/Make.defs
net/devif/devif.h
net/devif/devif_cansend.c
net/devif/devif_pktsend.c
net/devif/devif_poll.c
net/icmp/icmp_sockif.c
net/icmpv6/icmpv6_sockif.c
net/ieee802154/ieee802154_sockif.c
net/inet/inet_sockif.c
net/local/local_sendpacket.c
net/local/local_sockif.c
net/net_initialize.c
net/netdev/netdev_register.c
net/netlink/netlink_sockif.c
net/pkt/pkt_sockif.c
net/socket/Kconfig
net/socket/Make.defs
net/socket/getsockopt.c
net/socket/net_sockif.c
net/socket/recvmsg.c
net/socket/sendmsg.c
net/socket/setsockopt.c
net/socket/socket.h*
I think that all of the files marked in read need some more detailed
review since they effect other logic. The few that I have studied look
fine, but we need to be especially careful with modifications to files
that can have side-effects. If the JPPMC agrees to the merge, then I
will run all files through nxstyle again before the merge.
