summaryrefslogtreecommitdiff
path: root/net/openvswitch/conntrack.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-03-17 01:10:43 +0300
committerDavid S. Miller <davem@davemloft.net>2021-03-17 01:10:43 +0300
commitce225298a0cde9e64494292bf34422553a22b68c (patch)
tree2963bbc434d3faa421cd3f63554b82fbb4c520ca /net/openvswitch/conntrack.h
parent8a4452ca29f9dc6a65e45a38c96af83b8ecb27fc (diff)
parente98d9ee64ee2cc9b1d1a8e26610ec4d0392ebe50 (diff)
downloadlinux-ce225298a0cde9e64494292bf34422553a22b68c.tar.xz
Merge tag 'linux-can-fixes-for-5.12-20210316' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says: ==================== pull-request: can 2021-03-16 this is a pull request of 11 patches for net/master. The first patch is by Martin Willi and fixes the deletion of network name spaces with physical CAN interfaces in them. The next two patches are by me an fix the ISOTP protocol, to ensure that unused flags in classical CAN frames are properly initialized to zero. Stephane Grosjean contributes a patch for the pcan_usb_fd driver, which add MODULE_SUPPORTED_DEVICE lines for two supported devices. Angelo Dureghello's patch for the flexcan driver fixes a potential div by zero, if the bitrate is not set during driver probe. Jimmy Assarsson's patch for the kvaser_pciefd disables bus load reporting in the device, if it was previously enabled by the vendor's out of tree drier. A patch for the kvaser_usb adds support for a new device, by adding the appropriate USB product ID. Tong Zhang contributes two patches for the c_can driver. First a use-after-free in the c_can_pci driver is fixed, in the second patch the runtime PM for the c_can_pci is fixed by moving the runtime PM enable/disable from the core driver to the platform driver. The last two patches are by Torin Cooper-Bennun for the m_can driver. First a extraneous msg loss warning is removed then he fixes the RX-path, which might be blocked by errors. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/conntrack.h')
0 files changed, 0 insertions, 0 deletions