summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6mr.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-11-19 15:28:58 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-19 15:28:58 -0500
commitddecab1abc97b45168599a52c334a7f9910d5a5a (patch)
treeaaacf93b2643afc07f7c62972723555791255c87 /net/ipv6/ip6mr.c
parent9737c6ab7afbc950e997ef80cba2c40dbbd16ea4 (diff)
parent80646733f11c2e9de3b6339f7e635047e6087280 (diff)
downloadlinux-stable-ddecab1abc97b45168599a52c334a7f9910d5a5a.tar.gz
linux-stable-ddecab1abc97b45168599a52c334a7f9910d5a5a.tar.bz2
linux-stable-ddecab1abc97b45168599a52c334a7f9910d5a5a.zip
Merge tag 'linux-can-fixes-for-3.18-20141118' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says: ==================== pull-request: can 2014-11-18 this is a pull request of 17 patches for net/master for the v3.18 release cycle. The last patch of this pull request ("can: m_can: update to support CAN FD features") adds, as the description says, a new feature to the m_can driver. As the m_can driver has been added in v3.18 there is no risk of causing a regression. Give me a note if this is not okay and I'll create a new pull request without it. There is a patch for the CAN infrastructure by Thomas Körper which fixes calling kfree_skb() from interrupt context. Roman Fietze fixes a typo also in the infrastructure. A patch by Dong Aisheng adds a generic helper function to tell if a skb is normal CAN or CAN-FD frame. Alexey Khoroshilov of the Linux Driver Verification project fixes a memory leak in the esd_usb2 driver. Two patches by Sudip Mukherjee remove unused variables and fixe the signess of a variable. Three patches by me add the missing .ndo_change_mtu callback to the xilinx_can, rcar_can and gs_usb driver. The remaining patches improve the m_can driver: David Cohen adds the missing CONFIG_HAS_IOMEM dependency. Dong Aisheng provides 6 bugfix patches (most important: missing RAM init, sleep in NAPI poll, dlc in RTR). While the last of his patches adds CAN FD support to the driver. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6mr.c')
0 files changed, 0 insertions, 0 deletions