summaryrefslogtreecommitdiff
path: root/net/netrom/nr_timer.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-08 15:11:28 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-08 15:11:28 -0500
commit9a9a7a572709487acb0d2de83b375e8fbb4f9d91 (patch)
tree672a24efe91c8221d9c246f97a209047f46b2bb7 /net/netrom/nr_timer.c
parentc502faf94153bd0fedc5389a936f728a659cc6ab (diff)
parenta6a3e026f0d358904afd3df6b7f952ed8ea5b942 (diff)
Merge branch 'stmmac-cleanups'
Corentin Labbe says: ==================== net: stmmac: misc fix I am currently working on dwmac-sun8i glue driver for Allwinner H3/A83T/A64. This series is the result of all minor problem found in the stmmac driver. All patch are tested on cubieboard2 via dwmac-sunxi and on pine64/orangepis via dwmac-sun8i. Changes since v1: - Removed netdev_dbg() in "net: stmmac: print phy information" - Removed patch "net: stmmac: Implement NAPI for TX", it will be reworked - Changed error message in "Correct the error message about invalid speed" - Added some acked-by ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom/nr_timer.c')
0 files changed, 0 insertions, 0 deletions
be unloaded while they are referenced by active instances, from Robert Shearman. 14) Fix truncated PHY LED trigger names, from Geert Uytterhoeven. 15) Fix a few regressions from virtio_net XDP support, from John Fastabend and Jakub Kicinski. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (102 commits) ISDN: eicon: silence misleading array-bounds warning net: phy: micrel: add support for KSZ8795 gtp: fix cross netns recv on gtp socket gtp: clear DF bit on GTP packet tx gtp: add genl family modules alias tcp: don't annotate mark on control socket from tcp_v6_send_response() ravb: unmap descriptors when freeing rings virtio_net: reject XDP programs using header adjustment virtio_net: use dev_kfree_skb for small buffer XDP receive r8152: check rx after napi is enabled r8152: re-schedule napi for tx r8152: avoid start_xmit to schedule napi when napi is disabled r8152: avoid start_xmit to call napi_schedule during autosuspend net: dsa: Bring back device detaching in dsa_slave_suspend() net: phy: leds: Fix truncated LED trigger names net: phy: leds: Break dependency of phy.h on phy_led_triggers.h net: phy: leds: Clear phy_num_led_triggers on failure to avoid crash net-next: ethernet: mediatek: change the compatible string Documentation: devicetree: change the mediatek ethernet compatible string bnxt_en: Fix RTNL lock usage on bnxt_get_port_module_status(). ...
Diffstat (limited to 'fs/xfs/xfs_log_cil.c')